Update to .NET8 (#70)

* Update to .NET8 * Update github actions
microsoft · Apr 16, 2024 · dea0b44 · dea0b44
1 parent 02fa0f6
commit dea0b44
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 28 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
       SOLUTION_FILE: "Microsoft.SPID.Proxy.sln"
       PUBLISH_FOLDER: "_publish"
       ARTIFACT_NAME: SPIDProxy
-      RELEASE_VERSION: 6.1.${{ github.run_number}}
+      RELEASE_VERSION: 8.0.${{ github.run_number}}
       RELEASE_ZIP_FILENAME: "release.zip"
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
@@ -31,12 +31,12 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v1.8.2
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
 
       - name: publish
         run: dotnet publish -c Release -o $PUBLISH_FOLDER -p:Version=$RELEASE_VERSION $SOLUTION_FILE

diff --git a/.github/workflows/spidproxy-pr.yml b/.github/workflows/spidproxy-pr.yml
@@ -27,12 +27,12 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v1.8.2
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
 
       - name: publish
         run: dotnet publish -c Release -o $PUBLISH_FOLDER $SOLUTION_FILE
diff --git a/WebApps/Proxy/Microsoft.SPID.Proxy/Microsoft.SPID.Proxy.csproj b/WebApps/Proxy/Microsoft.SPID.Proxy/Microsoft.SPID.Proxy.csproj
@@ -7,7 +7,7 @@
 		</ApplicationInsightsAnnotationResourceId>
 	</PropertyGroup>
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<OutputPath>bin\</OutputPath>
 		<RazorCompileOnBuild>false</RazorCompileOnBuild>
@@ -16,29 +16,21 @@
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
-		<PackageReference Include="Azure.Identity" Version="1.6.0" />
-		<PackageReference Include="bootstrap" Version="5.1.2" />
-		<PackageReference Include="jQuery" Version="3.6.0" />
-		<PackageReference Include="jQuery.Validation" Version="1.19.3" />
-		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
-		<PackageReference Include="Microsoft.ApplicationInsights.TraceListener" Version="2.19.0" />
-		<PackageReference Include="Microsoft.ApplicationInsights.Web" Version="2.19.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.0" />
-		<PackageReference Include="Microsoft.jQuery.Unobtrusive.Validation" Version="3.2.12" />
-		<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="161.46521.71" />
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
+		<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
+		<PackageReference Include="Azure.Identity" Version="1.11.0" />
+		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
+		<PackageReference Include="Microsoft.ApplicationInsights.TraceListener" Version="2.22.0" />
+		<PackageReference Include="Microsoft.ApplicationInsights.Web" Version="2.22.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.4" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
 		<PackageReference Include="Modernizr" Version="2.8.3" />
 		<PackageReference Include="Respond" Version="1.4.2" />
 		<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
 		<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-		<PackageReference Include="System.Management" Version="6.0.0" />
-		<PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
-		<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.255803">
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="System.Management" Version="8.0.0" />
+		<PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.4" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
 		<PackageReference Include="System.Security.Cryptography.Csp" Version="4.3.0" />
 	</ItemGroup>

diff --git a/WebApps/Proxy/Microsoft.SPID.Proxy/Models/Options/ConfigureForwardedHeadersOptions.cs b/WebApps/Proxy/Microsoft.SPID.Proxy/Models/Options/ConfigureForwardedHeadersOptions.cs
@@ -38,7 +38,7 @@ public void Configure(ForwardedHeadersOptions options)
 					var prefix = networkSplit[0];
 					var prefixLength = int.Parse(networkSplit[1]);
 
-					options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse(prefix), prefixLength));
+					options.KnownNetworks.Add(new AspNetCore.HttpOverrides.IPNetwork(IPAddress.Parse(prefix), prefixLength));
 				}
 			}