net9 (#168)

* net9 * actions
petrsvihlik · Nov 16, 2024 · b2564ac · b2564ac
1 parent 743e119
commit b2564ac
Show file tree

Hide file tree

Showing 20 changed files with 95 additions and 94 deletions.
diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '9.0.x'
     - name: Restore dependencies
       run: dotnet restore -s ${MYGET_FEED} -s https://api.nuget.org/v3/index.json
       env:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -19,14 +19,14 @@ jobs:
     environment:
       name: Integrate Pull Request
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 2
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '9.0.x'
     - name: Restore dependencies
       run: dotnet restore -s ${MYGET_FEED} -s https://api.nuget.org/v3/index.json
       env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '9.0.x'
     - name: Extract version from tag
       id: get_version
       uses: battila7/get-version-action@v2

diff --git a/src/WopiHost.Abstractions/WopiHost.Abstractions.csproj b/src/WopiHost.Abstractions/WopiHost.Abstractions.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>WopiHost.Abstractions Class Library</Description>
     <Authors>Petr Svihlik</Authors>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>WopiHost.Abstractions</AssemblyName>
     <PackageId>WopiHost.Abstractions</PackageId>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -37,9 +37,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="9.0.0" />
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/WopiHost.Cobalt/CobaltHostLockingStore.cs b/src/WopiHost.Cobalt/CobaltHostLockingStore.cs
@@ -175,7 +175,7 @@ public override GetCoauthoringStatusRequest.OutputType HandleGetCoauthoringStatu
         return result;
     }
 
-    public override Dictionary<string, EditorsTableEntry> QueryEditorsTable() => new();
+    public override Dictionary<string, EditorsTableEntry> QueryEditorsTable() => [];
 
     public override JoinEditingSessionRequest.OutputType HandleJoinEditingSession(JoinEditingSessionRequest.InputType input)
     {

diff --git a/src/WopiHost.Cobalt/WopiHost.Cobalt.csproj b/src/WopiHost.Cobalt/WopiHost.Cobalt.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>WopiHost.Cobalt Class Library</Description>
     <Authors>Petr Svihlik</Authors>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>WopiHost.Cobalt</AssemblyName>
     <PackageId>WopiHost.Cobalt</PackageId>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

diff --git a/src/WopiHost.Core/FileExtensions.cs b/src/WopiHost.Core/FileExtensions.cs
@@ -32,7 +32,7 @@ public static CheckFileInfo GetCheckFileInfo(this IWopiFile file, ClaimsPrincipa
             checkFileInfo.UserId = principal.FindFirst(ClaimTypes.NameIdentifier)?.Value.ToSafeIdentity();
             checkFileInfo.UserFriendlyName = principal.FindFirst(ClaimTypes.Name)?.Value;
 
-            var permissions = (WopiUserPermissions)Enum.Parse(typeof(WopiUserPermissions), principal.FindFirst(WopiClaimTypes.USER_PERMISSIONS).Value);
+            var permissions = Enum.Parse<WopiUserPermissions>(principal.FindFirst(WopiClaimTypes.USER_PERMISSIONS).Value);
 
             checkFileInfo.ReadOnly = permissions.HasFlag(WopiUserPermissions.ReadOnly);
             checkFileInfo.RestrictedWebViewOnly = permissions.HasFlag(WopiUserPermissions.RestrictedWebViewOnly);

diff --git a/src/WopiHost.Core/WopiHost.Core.csproj b/src/WopiHost.Core/WopiHost.Core.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Description>WopiHost.Core Class Library</Description>
 		<Authors>Petr Svihlik</Authors>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<AssemblyName>WopiHost.Core</AssemblyName>
 		<PackageId>WopiHost.Core</PackageId>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -42,7 +42,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
 	</ItemGroup>
 </Project>
diff --git a/src/WopiHost.Discovery/WopiHost.Discovery.csproj b/src/WopiHost.Discovery/WopiHost.Discovery.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Description>WopiHost.Discovery Class Library</Description>
 		<Authors>Petr Svihlik</Authors>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<AssemblyName>WopiHost.Discovery</AssemblyName>
 		<PackageId>WopiHost.Discovery</PackageId>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -41,5 +41,6 @@
 		<PackageReference Include="System.Linq" Version="4.3.0" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 	</ItemGroup>
 </Project>
diff --git a/src/WopiHost.FileSystemProvider/WopiHost.FileSystemProvider.csproj b/src/WopiHost.FileSystemProvider/WopiHost.FileSystemProvider.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Description>WopiHost.FileSystemProvider Class Library</Description>
 		<Authors>Petr Svihlik</Authors>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<AssemblyName>WopiHost.FileSystemProvider</AssemblyName>
 		<PackageId>WopiHost.FileSystemProvider</PackageId>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -33,17 +33,17 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.2" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
 		<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
 		<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
 		<PackageReference Include="System.Security.Claims" Version="4.3.0" />
 		<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
-		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.3.1" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
+		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/WopiHost.FileSystemProvider/WopiSecurityHandler.cs b/src/WopiHost.FileSystemProvider/WopiSecurityHandler.cs
@@ -41,15 +41,15 @@ private SymmetricSecurityKey Key
         {
             "Anonymous",
             new ClaimsPrincipal(
-            new ClaimsIdentity(new List<Claim>
-            {
+            new ClaimsIdentity(
+            [
                 new(ClaimTypes.NameIdentifier, "12345"),
                 new(ClaimTypes.Name, "Anonymous"),
                 new(ClaimTypes.Email, "anonymous@domain.tld"),
 
                 //TDOO: this needs to be done per file
                 new(WopiClaimTypes.USER_PERMISSIONS, (WopiUserPermissions.UserCanWrite | WopiUserPermissions.UserCanRename | WopiUserPermissions.UserCanAttend | WopiUserPermissions.UserCanPresent).ToString())
-            })
+            ])
         )
         }
     };

diff --git a/src/WopiHost.Url/WopiHost.Url.csproj b/src/WopiHost.Url/WopiHost.Url.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>WopiHost.Url Class Library</Description>
     <Authors>Petr Svihlik</Authors>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>WopiHost.Url</AssemblyName>
     <PackageId>WopiHost.Url</PackageId>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

diff --git a/src/WopiHost.Web/WopiHost.Web.csproj b/src/WopiHost.Web/WopiHost.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>WopiHost.Web</AssemblyName>
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/WopiHost/WopiHost.csproj b/src/WopiHost/WopiHost.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>WopiHost</AssemblyName>
     <OutputType>Exe</OutputType>
     <PublishReadyToRun>true</PublishReadyToRun>
@@ -23,19 +23,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="8.0.0" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Autofac" Version="8.1.1" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/test/WopiHost.Core.Tests/WopiHost.Core.Tests.csproj b/test/WopiHost.Core.Tests/WopiHost.Core.Tests.csproj
@@ -1,27 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\src\WopiHost.Core\WopiHost.Core.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Update="coverlet.collector" Version="6.0.1">
+	  <PackageReference Update="coverlet.collector" Version="6.0.2">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
-	  <PackageReference Update="coverlet.msbuild" Version="6.0.1">
+	  <PackageReference Update="coverlet.msbuild" Version="6.0.2">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
-	  <PackageReference Update="FakeItEasy" Version="8.1.0" />
-	  <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-	  <PackageReference Update="xunit" Version="2.7.0" />
-	  <PackageReference Update="xunit.runner.console" Version="2.7.0">
+	  <PackageReference Update="FakeItEasy" Version="8.3.0" />
+	  <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+	  <PackageReference Update="xunit" Version="2.9.2" />
+	  <PackageReference Update="xunit.runner.console" Version="2.9.2">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 	  </PackageReference>
-	  <PackageReference Update="xunit.runner.visualstudio" Version="2.5.7">
+	  <PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 	  </PackageReference>