Skip to content

Commit 743e119

Browse files
petrsvihlikpetrsvihlik
committed
removed release conflicts
1 parent 9c70c40 commit 743e119

File tree

4 files changed

+56
-57
lines changed

4 files changed

+56
-57
lines changed

‎src/WopiHost.Cobalt/CobaltHostLockingStore.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public override GetCoauthoringStatusRequest.OutputType HandleGetCoauthoringStatu
175175
return result;
176176
}
177177

178-
public override Dictionary<string, EditorsTableEntry> QueryEditorsTable() => new Dictionary<string, EditorsTableEntry>();
178+
public override Dictionary<string, EditorsTableEntry> QueryEditorsTable() => new();
179179

180180
public override JoinEditingSessionRequest.OutputType HandleJoinEditingSession(JoinEditingSessionRequest.InputType input)
181181
{

‎src/WopiHost.FileSystemProvider/WopiFile.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ public string Owner
8080
{
8181
return FileInfo.GetAccessControl().GetOwner(typeof(NTAccount)).ToString();
8282
}
83-
else if (OperatingSystem.IsLinux())
84-
{
85-
return Mono.Unix.UnixFileSystemInfo.GetFileSystemEntry(FilePath).OwnerUser.UserName; //TODO: test
86-
}
83+
//else if (OperatingSystem.IsLinux())
84+
//{
85+
// return Mono.Unix.UnixFileSystemInfo.GetFileSystemEntry(FilePath).OwnerUser.UserName; //TODO: test
86+
//}
8787
else
8888
{
8989
return "UNSUPPORTED_PLATFORM";

‎src/WopiHost.FileSystemProvider/WopiHost.FileSystemProvider.csproj

+47-48
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,53 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<Description>WopiHost.FileSystemProvider Class Library</Description>
5-
<Authors>Petr Svihlik</Authors>
6-
<TargetFramework>net8.0</TargetFramework>
7-
<AssemblyName>WopiHost.FileSystemProvider</AssemblyName>
8-
<PackageId>WopiHost.FileSystemProvider</PackageId>
9-
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
10-
<PackageIcon>logo.png</PackageIcon>
11-
<PackageTags>WOPI;MS-WOPI;MS-FSSHTTP;Office Online Server;Office Web Apps;Web Application Open Platform Interface</PackageTags>
12-
<RepositoryType>git</RepositoryType>
13-
<RepositoryUrl>https://github.com/petrsvihlik/WopiHost.git</RepositoryUrl>
14-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
15-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
16-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
17-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
18-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
19-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
20-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
21-
</PropertyGroup>
22-
23-
<ItemGroup>
24-
<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="" />
25-
<None Include="..\..\img\logo.png" Pack="true" PackagePath="" />
26-
</ItemGroup>
27-
28-
<PropertyGroup>
29-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
30-
<IncludeSymbols>true</IncludeSymbols>
31-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
32-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
33-
</PropertyGroup>
3+
<PropertyGroup>
4+
<Description>WopiHost.FileSystemProvider Class Library</Description>
5+
<Authors>Petr Svihlik</Authors>
6+
<TargetFramework>net8.0</TargetFramework>
7+
<AssemblyName>WopiHost.FileSystemProvider</AssemblyName>
8+
<PackageId>WopiHost.FileSystemProvider</PackageId>
9+
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
10+
<PackageIcon>logo.png</PackageIcon>
11+
<PackageTags>WOPI;MS-WOPI;MS-FSSHTTP;Office Online Server;Office Web Apps;Web Application Open Platform Interface</PackageTags>
12+
<RepositoryType>git</RepositoryType>
13+
<RepositoryUrl>https://github.com/petrsvihlik/WopiHost.git</RepositoryUrl>
14+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
15+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
16+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
17+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
18+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
19+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
20+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
21+
</PropertyGroup>
3422

35-
<ItemGroup>
36-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
37-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
38-
<PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
39-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.2" />
40-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
42-
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
43-
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
44-
<PackageReference Include="System.Security.Claims" Version="4.3.0" />
45-
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
46-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.3.1" />
47-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
48-
</ItemGroup>
23+
<ItemGroup>
24+
<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="" />
25+
<None Include="..\..\img\logo.png" Pack="true" PackagePath="" />
26+
</ItemGroup>
4927

50-
<ItemGroup>
51-
<ProjectReference Include="..\WopiHost.Abstractions\WopiHost.Abstractions.csproj" />
52-
</ItemGroup>
28+
<PropertyGroup>
29+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
30+
<IncludeSymbols>true</IncludeSymbols>
31+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
32+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
33+
</PropertyGroup>
34+
35+
<ItemGroup>
36+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
37+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
38+
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.2" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
41+
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
42+
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
43+
<PackageReference Include="System.Security.Claims" Version="4.3.0" />
44+
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
45+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.3.1" />
46+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
47+
</ItemGroup>
48+
49+
<ItemGroup>
50+
<ProjectReference Include="..\WopiHost.Abstractions\WopiHost.Abstractions.csproj" />
51+
</ItemGroup>
5352

5453
</Project>

‎src/WopiHost.FileSystemProvider/WopiSecurityHandler.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ private SymmetricSecurityKey Key
4343
new ClaimsPrincipal(
4444
new ClaimsIdentity(new List<Claim>
4545
{
46-
new Claim(ClaimTypes.NameIdentifier, "12345"),
47-
new Claim(ClaimTypes.Name, "Anonymous"),
48-
new Claim(ClaimTypes.Email, "anonymous@domain.tld"),
46+
new(ClaimTypes.NameIdentifier, "12345"),
47+
new(ClaimTypes.Name, "Anonymous"),
48+
new(ClaimTypes.Email, "anonymous@domain.tld"),
4949

5050
//TDOO: this needs to be done per file
51-
new Claim(WopiClaimTypes.USER_PERMISSIONS, (WopiUserPermissions.UserCanWrite | WopiUserPermissions.UserCanRename | WopiUserPermissions.UserCanAttend | WopiUserPermissions.UserCanPresent).ToString())
51+
new(WopiClaimTypes.USER_PERMISSIONS, (WopiUserPermissions.UserCanWrite | WopiUserPermissions.UserCanRename | WopiUserPermissions.UserCanAttend | WopiUserPermissions.UserCanPresent).ToString())
5252
})
5353
)
5454
}

0 commit comments

Comments
 (0)