feat: upgrade to .NET 9

Altinn · Dec 6, 2024 · 8d251db · 8d251db
1 parent 691e19e
commit 8d251db
Show file tree

Hide file tree

Showing 20 changed files with 109 additions and 42 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <BaseArtifactsPath Condition=" '$(BaseArtifactsPath)' == '' ">$(MSBuildThisFileDirectory)artifacts\</BaseArtifactsPath>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -14,43 +14,43 @@
     <PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.3.2" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.1" />
+    <PackageVersion Include="FluentAssertions" Version="7.0.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.22.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
-    <PackageVersion Include="Microsoft.Build.Artifacts" Version="6.1.47" />
+    <PackageVersion Include="Microsoft.Build.Artifacts" Version="6.1.48" />
     <PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.2.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.1.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
-    <PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.5" />
-    <PackageVersion Include="Npgsql" Version="8.0.5" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
+    <PackageVersion Include="Npgsql.OpenTelemetry" Version="9.0.1" />
+    <PackageVersion Include="Npgsql" Version="9.0.1" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
-    <PackageVersion Include="OpenTelemetry" Version="1.9.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="6.9.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.9.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
+    <PackageVersion Include="OpenTelemetry" Version="1.10.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="7.1.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.1.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.1.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.1.0" />
-    <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
-    <PackageVersion Include="Testcontainers.PostgreSql" Version="3.10.0" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
+    <PackageVersion Include="System.IO.Pipelines" Version="9.0.0" />
+    <PackageVersion Include="Testcontainers.PostgreSql" Version="4.0.0" />
     <PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
-    <PackageVersion Include="Verify.Xunit" Version="28.3.2" />
+    <PackageVersion Include="Verify.Xunit" Version="28.4.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="Yuniql.Core" Version="1.3.15" />
     <PackageVersion Include="Yuniql.PostgreSql" Version="1.3.15" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Altinn.Authorization.ProblemDetails/Version.props b/src/Altinn.Authorization.ProblemDetails/Version.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>3.0.1</Version>
+    <Version>0.0.0</Version>
   </PropertyGroup>
 
 </Project>
diff --git a/...s/src/ProblemDetails.Abstractions/Altinn.Authorization.ProblemDetails.Abstractions.csproj b/...s/src/ProblemDetails.Abstractions/Altinn.Authorization.ProblemDetails.Abstractions.csproj
@@ -13,4 +13,10 @@
 		<PackageReference Include="CommunityToolkit.Diagnostics" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <PackageReference Update="Microsoft.Build.Artifacts">
+	    <IncludeAssets>build; buildtransitive</IncludeAssets>
+	  </PackageReference>
+	</ItemGroup>
+
 </Project>
diff --git a/...uthorization.ProblemDetails/src/ProblemDetails/Altinn.Authorization.ProblemDetails.csproj b/...uthorization.ProblemDetails/src/ProblemDetails/Altinn.Authorization.ProblemDetails.csproj
@@ -9,8 +9,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\ProblemDetails.Abstractions\Altinn.Authorization.ProblemDetails.Abstractions.csproj" />
+    <ProjectReference Include="..\ProblemDetails.Abstractions\Altinn.Authorization.ProblemDetails.Abstractions.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Build.Artifacts">
+      <IncludeAssets>build; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/src/Altinn.Authorization.ServiceDefaults/Version.props b/src/Altinn.Authorization.ServiceDefaults/Version.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>2.7.0</Version>
+    <Version>0.0.0</Version>
   </PropertyGroup>
 
 </Project>
diff --git a/...rviceDefaults.Npgsql.TestSeed/Altinn.Authorization.ServiceDefaults.Npgsql.TestSeed.csproj b/...rviceDefaults.Npgsql.TestSeed/Altinn.Authorization.ServiceDefaults.Npgsql.TestSeed.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -14,4 +13,10 @@
     <ProjectReference Include="..\ServiceDefaults.Npgsql\Altinn.Authorization.ServiceDefaults.Npgsql.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Build.Artifacts">
+      <IncludeAssets>build; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/...c/ServiceDefaults.Npgsql.Yuniql/Altinn.Authorization.ServiceDefaults.Npgsql.Yuniql.csproj b/...c/ServiceDefaults.Npgsql.Yuniql/Altinn.Authorization.ServiceDefaults.Npgsql.Yuniql.csproj
@@ -15,9 +15,14 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference
-			Include="..\ServiceDefaults.Npgsql\Altinn.Authorization.ServiceDefaults.Npgsql.csproj" />
+		<ProjectReference Include="..\ServiceDefaults.Npgsql\Altinn.Authorization.ServiceDefaults.Npgsql.csproj" />
 		<ProjectReference Include="..\ServiceDefaults\Altinn.Authorization.ServiceDefaults.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <PackageReference Update="Microsoft.Build.Artifacts">
+	    <IncludeAssets>build; buildtransitive</IncludeAssets>
+	  </PackageReference>
+	</ItemGroup>
+
 </Project>
diff --git a/...iceDefaults/src/ServiceDefaults.Npgsql/Altinn.Authorization.ServiceDefaults.Npgsql.csproj b/...iceDefaults/src/ServiceDefaults.Npgsql/Altinn.Authorization.ServiceDefaults.Npgsql.csproj
@@ -14,4 +14,10 @@
     <ProjectReference Include="..\ServiceDefaults\Altinn.Authorization.ServiceDefaults.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Build.Artifacts">
+      <IncludeAssets>build; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/...aults/src/ServiceDefaults.Telemetry/Altinn.Authorization.ServiceDefaults.Telemetry.csproj b/...aults/src/ServiceDefaults.Telemetry/Altinn.Authorization.ServiceDefaults.Telemetry.csproj
@@ -1,7 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-	  <InternalsVisibleTo Include="Altinn.Authorization.ServiceDefaults.Tests"/>
+	  <InternalsVisibleTo Include="Altinn.Authorization.ServiceDefaults.Tests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Build.Artifacts">
+      <IncludeAssets>build; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/...orization.ServiceDefaults/src/ServiceDefaults/Altinn.Authorization.ServiceDefaults.csproj b/...orization.ServiceDefaults/src/ServiceDefaults/Altinn.Authorization.ServiceDefaults.csproj
@@ -21,4 +21,10 @@
     <ProjectReference Include="..\ServiceDefaults.Telemetry\Altinn.Authorization.ServiceDefaults.Telemetry.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Build.Artifacts">
+      <IncludeAssets>build; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Altinn.Cli/Version.props b/src/Altinn.Cli/Version.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>1.1.0</Version>
+    <Version>0.0.0</Version>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Altinn.Cli/src/Altinn.Cli.Jwks/Altinn.Cli.Jwks.csproj b/src/Altinn.Cli/src/Altinn.Cli.Jwks/Altinn.Cli.Jwks.csproj
@@ -19,4 +19,10 @@
     <PackageReference Include="System.IO.Pipelines" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.Build.Artifacts">
+      <IncludeAssets>build; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Altinn.Swashbuckle/Version.props b/src/Altinn.Swashbuckle/Version.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>2.1.1</Version>
+    <Version>0.0.0</Version>
   </PropertyGroup>
 
 </Project>
diff --git a/...nn.Swashbuckle/src/Altinn.Swashbuckle.Abstractions/Altinn.Swashbuckle.Abstractions.csproj b/...nn.Swashbuckle/src/Altinn.Swashbuckle.Abstractions/Altinn.Swashbuckle.Abstractions.csproj
@@ -14,4 +14,10 @@
 		<PackageReference Include="Microsoft.Extensions.Options" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <PackageReference Update="Microsoft.Build.Artifacts">
+	    <IncludeAssets>build; buildtransitive</IncludeAssets>
+	  </PackageReference>
+	</ItemGroup>
+
 </Project>
diff --git a/src/Altinn.Swashbuckle/src/Altinn.Swashbuckle/Altinn.Swashbuckle.csproj b/src/Altinn.Swashbuckle/src/Altinn.Swashbuckle/Altinn.Swashbuckle.csproj
@@ -10,8 +10,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference
-			Include="..\Altinn.Swashbuckle.Abstractions\Altinn.Swashbuckle.Abstractions.csproj" />
+		<ProjectReference Include="..\Altinn.Swashbuckle.Abstractions\Altinn.Swashbuckle.Abstractions.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <PackageReference Update="Microsoft.Build.Artifacts">
+	    <IncludeAssets>build; buildtransitive</IncludeAssets>
+	  </PackageReference>
 	</ItemGroup>
 
 </Project>
diff --git a/src/Altinn.Urn/Version.props b/src/Altinn.Urn/Version.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>2.5.1</Version>
+    <Version>0.0.0</Version>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Altinn.Urn/src/Altinn.Urn.SourceGenerator/Altinn.Urn.SourceGenerator.csproj b/src/Altinn.Urn/src/Altinn.Urn.SourceGenerator/Altinn.Urn.SourceGenerator.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<!-- 👇 Source generators must target netstandard 2.0 -->
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0</TargetFrameworks>
 		<!-- 👇 We don't want to reference the source generator dll directly in consuming projects -->
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 		<!-- 👇 Since we target netstandard2.0 we need to manually set the lang version to get newer

diff --git a/src/Altinn.Urn/src/Altinn.Urn.Swashbuckle/Altinn.Urn.Swashbuckle.csproj b/src/Altinn.Urn/src/Altinn.Urn.Swashbuckle/Altinn.Urn.Swashbuckle.csproj
@@ -9,9 +9,14 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference
-			Include="..\..\..\Altinn.Swashbuckle\src\Altinn.Swashbuckle\Altinn.Swashbuckle.csproj" />
+		<ProjectReference Include="..\..\..\Altinn.Swashbuckle\src\Altinn.Swashbuckle\Altinn.Swashbuckle.csproj" />
 		<ProjectReference Include="..\Altinn.Urn\Altinn.Urn.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <PackageReference Update="Microsoft.Build.Artifacts">
+	    <IncludeAssets>build; buildtransitive</IncludeAssets>
+	  </PackageReference>
+	</ItemGroup>
+
 </Project>
diff --git a/src/Altinn.Urn/src/Altinn.Urn/Altinn.Urn.csproj b/src/Altinn.Urn/src/Altinn.Urn/Altinn.Urn.csproj
@@ -27,4 +27,10 @@
 		</ItemGroup>
 	</Target>
 
+	<ItemGroup>
+	  <PackageReference Update="Microsoft.Build.Artifacts">
+	    <IncludeAssets>build; buildtransitive</IncludeAssets>
+	  </PackageReference>
+	</ItemGroup>
+
 </Project>