TEST-0010 Add NET 9 target, update packages and switch to project folder

hwinther · Nov 13, 2024 · b26f00b · b26f00b
1 parent bebc43b
commit b26f00b
Show file tree

Hide file tree

Showing 12 changed files with 630 additions and 620 deletions.
diff --git a/shared/NugetDistSample/NugetDistSample.csproj b/shared/NugetDistSample/NugetDistSample.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>nuget_distribution_example</PackageId>
-    <Version>0.0.26</Version>
+    <Version>0.0.33</Version>
     <Authors>Hans Christian Winther-Sørensen</Authors>
     <Company>WSH</Company>
     <PackageDescription>Distributing shared project files example</PackageDescription>

diff --git a/shared/NugetDistSample/Program.cs b/shared/NugetDistSample/Program.cs
@@ -6,19 +6,19 @@
 if (args.Length == 2)
 {
     var msbuildDir = args[0];
-    var solutionDir = args[1];
+    var projectDir = args[1];
     Console.WriteLine($"MsbuildDir: {msbuildDir}");
-    Console.WriteLine($"SolutionDir: {solutionDir}");
+    Console.WriteLine($"ProjectDir: {projectDir}");
 
-    var solutionSignature = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(solutionDir));
-    var cachePath = Path.Combine(msbuildDir, "..", $"cached-run-{solutionSignature}");
+    var projectSignature = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(projectDir));
+    var cachePath = Path.Combine(msbuildDir, "..", $"cached-run-{projectSignature}");
     if (Path.Exists(cachePath))
     {
-        Console.WriteLine("Already executed for this solution.");
+        Console.WriteLine("Already executed for this project.");
         return;
     }
 
-    var gitFolderPath = FindGitFolder(solutionDir);
+    var gitFolderPath = FindGitFolder(projectDir);
     if (gitFolderPath == null)
     {
         Console.WriteLine(".git folder not found.");
@@ -39,7 +39,7 @@
 }
 else
 {
-    Console.WriteLine("Usage: NugetDistSample <MsbuildDir> <SolutionDir>");
+    Console.WriteLine("Usage: NugetDistSample <MsbuildDir> <ProjectDir>");
 }
 
 return;

diff --git a/shared/NugetDistSample/build/nuget_distribution_example.props b/shared/NugetDistSample/build/nuget_distribution_example.props
@@ -1,11 +1,7 @@
 <Project>
   <Target Name="DistSampleInit" BeforeTargets="CollectPackageReferences">
-    <!--Message Text="Dist sample init SolutionDir=$(SolutionDir)" Importance="High" />
-    <Message Text="Dist sample init MSBuildThisFileDirectory=$(MSBuildThisFileDirectory)" Importance="High" />
-    <ItemGroup>
-      <File Include="$(MSBuildThisFileDirectory)..\content\**\*.*"></File>
-    </ItemGroup>
-    <Copy SourceFiles="@(File)" DestinationFolder="$(SolutionDir)\"></Copy-->
-    <Exec Command="dotnet $(MSBuildThisFileDirectory)..\lib\$(TargetFramework)\NugetDistSample.dll $(MSBuildThisFileDirectory) $(SolutionDir)" />
+    <Warning Code="DSAMPLE001" Text="DistSample executing" />
+    <Exec
+      Command="dotnet $(MSBuildThisFileDirectory)..\lib\$(TargetFramework)\NugetDistSample.dll $(MSBuildThisFileDirectory) $(ProjectDir)" />
   </Target>
 </Project>
diff --git a/shared/NugetDistSample/packages.lock.json b/shared/NugetDistSample/packages.lock.json
@@ -1,6 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net8.0": {}
+    "net8.0": {},
+    "net9.0": {}
   }
 }
diff --git a/shared/NugetDistSample/readme.md b/shared/NugetDistSample/readme.md
diff --git a/src/backend/.config/dotnet-tools.json b/src/backend/.config/dotnet-tools.json
@@ -29,6 +29,13 @@
         "dotnet-stryker"
       ],
       "rollForward": false
+    },
+    "dotnet-outdated-tool": {
+      "version": "4.6.4",
+      "commands": [
+        "dotnet-outdated"
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/src/backend/Directory.Build.props b/src/backend/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>

diff --git a/src/backend/WebApi/WebApi.csproj b/src/backend/WebApi/WebApi.csproj
@@ -10,17 +10,22 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+    <NuGetAuditSuppress
+      Include="https://github.com/advisories/GHSA-5f2m-466j-3848;https://github.com/advisories/GHSA-x5qj-9vmx-7g6g;https://github.com/advisories/GHSA-xhfc-gr8f-ffwc" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.9.0" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.10.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.10.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
@@ -29,8 +34,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="6.9.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,7 +49,9 @@
 
   <Target Name="CreateSwaggerJson" AfterTargets="Build" Condition="$(Configuration)=='Debug'">
     <Message Text="Updating swagger schema file" Importance="High" />
-    <Exec EnvironmentVariables="DOTNET_ENVIRONMENT=Swagger;ASPNETCORE_ENVIRONMENT=Swagger" Command="dotnet swagger tofile --output swagger.json $(OutputPath)$(AssemblyName).dll v1" WorkingDirectory="$(ProjectDir)" />
+    <Exec EnvironmentVariables="DOTNET_ENVIRONMENT=Swagger;ASPNETCORE_ENVIRONMENT=Swagger"
+          Command="dotnet swagger tofile --output swagger.json $(OutputPath)$(AssemblyName).dll v1"
+          WorkingDirectory="$(ProjectDir)" />
   </Target>
 
 </Project>