Skip to content

Commit b2564ac

Browse files
petrsvihlikpetrsvihlik
authored
net9 (#168)
* net9 * actions
1 parent 743e119 commit b2564ac

20 files changed

+95
-94
lines changed

‎.github/workflows/integrate.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Setup .NET
15-
uses: actions/setup-dotnet@v3
15+
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: '8.0.x'
17+
dotnet-version: '9.0.x'
1818
- name: Restore dependencies
1919
run: dotnet restore -s ${MYGET_FEED} -s https://api.nuget.org/v3/index.json
2020
env:

‎.github/workflows/pull_request.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
environment:
2020
name: Integrate Pull Request
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
with:
2424
ref: ${{ github.event.pull_request.head.sha }}
2525
fetch-depth: 2
2626
- name: Setup .NET
27-
uses: actions/setup-dotnet@v3
27+
uses: actions/setup-dotnet@v4
2828
with:
29-
dotnet-version: '8.0.x'
29+
dotnet-version: '9.0.x'
3030
- name: Restore dependencies
3131
run: dotnet restore -s ${MYGET_FEED} -s https://api.nuget.org/v3/index.json
3232
env:

‎.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Setup .NET
15-
uses: actions/setup-dotnet@v3
15+
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: '8.0.x'
17+
dotnet-version: '9.0.x'
1818
- name: Extract version from tag
1919
id: get_version
2020
uses: battila7/get-version-action@v2

‎src/WopiHost.Abstractions/WopiHost.Abstractions.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>WopiHost.Abstractions Class Library</Description>
55
<Authors>Petr Svihlik</Authors>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net9.0</TargetFramework>
77
<AssemblyName>WopiHost.Abstractions</AssemblyName>
88
<PackageId>WopiHost.Abstractions</PackageId>
99
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -37,9 +37,9 @@
3737
</ItemGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.2" />
40+
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="9.0.0" />
4141
<PackageReference Include="System.Security.Claims" Version="4.3.0" />
42-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.3.1" />
42+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
4343
</ItemGroup>
4444

4545
</Project>

‎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();
178+
public override Dictionary<string, EditorsTableEntry> QueryEditorsTable() => [];
179179

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

‎src/WopiHost.Cobalt/WopiHost.Cobalt.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>WopiHost.Cobalt Class Library</Description>
55
<Authors>Petr Svihlik</Authors>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net9.0</TargetFramework>
77
<AssemblyName>WopiHost.Cobalt</AssemblyName>
88
<PackageId>WopiHost.Cobalt</PackageId>
99
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

‎src/WopiHost.Core/FileExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static CheckFileInfo GetCheckFileInfo(this IWopiFile file, ClaimsPrincipa
3232
checkFileInfo.UserId = principal.FindFirst(ClaimTypes.NameIdentifier)?.Value.ToSafeIdentity();
3333
checkFileInfo.UserFriendlyName = principal.FindFirst(ClaimTypes.Name)?.Value;
3434

35-
var permissions = (WopiUserPermissions)Enum.Parse(typeof(WopiUserPermissions), principal.FindFirst(WopiClaimTypes.USER_PERMISSIONS).Value);
35+
var permissions = Enum.Parse<WopiUserPermissions>(principal.FindFirst(WopiClaimTypes.USER_PERMISSIONS).Value);
3636

3737
checkFileInfo.ReadOnly = permissions.HasFlag(WopiUserPermissions.ReadOnly);
3838
checkFileInfo.RestrictedWebViewOnly = permissions.HasFlag(WopiUserPermissions.RestrictedWebViewOnly);

‎src/WopiHost.Core/WopiHost.Core.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>WopiHost.Core Class Library</Description>
55
<Authors>Petr Svihlik</Authors>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net9.0</TargetFramework>
77
<AssemblyName>WopiHost.Core</AssemblyName>
88
<PackageId>WopiHost.Core</PackageId>
99
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -42,7 +42,7 @@
4242
</ItemGroup>
4343

4444
<ItemGroup>
45-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
46-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
45+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
46+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
4747
</ItemGroup>
4848
</Project>

‎src/WopiHost.Discovery/WopiHost.Discovery.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>WopiHost.Discovery Class Library</Description>
55
<Authors>Petr Svihlik</Authors>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net9.0</TargetFramework>
77
<AssemblyName>WopiHost.Discovery</AssemblyName>
88
<PackageId>WopiHost.Discovery</PackageId>
99
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -41,5 +41,6 @@
4141
<PackageReference Include="System.Linq" Version="4.3.0" />
4242
<PackageReference Include="System.Net.Http" Version="4.3.4" />
4343
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
44+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
4445
</ItemGroup>
4546
</Project>

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>WopiHost.FileSystemProvider Class Library</Description>
55
<Authors>Petr Svihlik</Authors>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net9.0</TargetFramework>
77
<AssemblyName>WopiHost.FileSystemProvider</AssemblyName>
88
<PackageId>WopiHost.FileSystemProvider</PackageId>
99
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -33,17 +33,17 @@
3333
</PropertyGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
3737
<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" />
38+
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="9.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
4141
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
4242
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
4343
<PackageReference Include="System.Security.Claims" Version="4.3.0" />
4444
<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" />
45+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
46+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
4747
</ItemGroup>
4848

4949
<ItemGroup>

‎src/WopiHost.FileSystemProvider/WopiSecurityHandler.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ private SymmetricSecurityKey Key
4141
{
4242
"Anonymous",
4343
new ClaimsPrincipal(
44-
new ClaimsIdentity(new List<Claim>
45-
{
44+
new ClaimsIdentity(
45+
[
4646
new(ClaimTypes.NameIdentifier, "12345"),
4747
new(ClaimTypes.Name, "Anonymous"),
4848
new(ClaimTypes.Email, "[email protected]"),
4949

5050
//TDOO: this needs to be done per file
5151
new(WopiClaimTypes.USER_PERMISSIONS, (WopiUserPermissions.UserCanWrite | WopiUserPermissions.UserCanRename | WopiUserPermissions.UserCanAttend | WopiUserPermissions.UserCanPresent).ToString())
52-
})
52+
])
5353
)
5454
}
5555
};

‎src/WopiHost.Url/WopiHost.Url.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>WopiHost.Url Class Library</Description>
55
<Authors>Petr Svihlik</Authors>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net9.0</TargetFramework>
77
<AssemblyName>WopiHost.Url</AssemblyName>
88
<PackageId>WopiHost.Url</PackageId>
99
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

‎src/WopiHost.Web/WopiHost.Web.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
66
<PreserveCompilationContext>true</PreserveCompilationContext>
77
<AssemblyName>WopiHost.Web</AssemblyName>
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.2" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/WopiHost/WopiHost.csproj

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<AssemblyName>WopiHost</AssemblyName>
66
<OutputType>Exe</OutputType>
77
<PublishReadyToRun>true</PublishReadyToRun>
@@ -23,19 +23,19 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Autofac" Version="8.0.0" />
27-
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
34-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
35-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
36-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
37-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
38-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
26+
<PackageReference Include="Autofac" Version="8.1.1" />
27+
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
38+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
3939
</ItemGroup>
4040

4141
</Project>

‎test/WopiHost.Core.Tests/WopiHost.Core.Tests.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<ProjectReference Include="..\..\src\WopiHost.Core\WopiHost.Core.csproj" />
77
</ItemGroup>
88
<ItemGroup>
9-
<PackageReference Update="coverlet.collector" Version="6.0.1">
9+
<PackageReference Update="coverlet.collector" Version="6.0.2">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1212
</PackageReference>
13-
<PackageReference Update="coverlet.msbuild" Version="6.0.1">
13+
<PackageReference Update="coverlet.msbuild" Version="6.0.2">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Update="FakeItEasy" Version="8.1.0" />
18-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.9.0" />
19-
<PackageReference Update="xunit" Version="2.7.0" />
20-
<PackageReference Update="xunit.runner.console" Version="2.7.0">
17+
<PackageReference Update="FakeItEasy" Version="8.3.0" />
18+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.1" />
19+
<PackageReference Update="xunit" Version="2.9.2" />
20+
<PackageReference Update="xunit.runner.console" Version="2.9.2">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.7">
24+
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2727
</PackageReference>

0 commit comments

Comments
 (0)