Merge test changes to main - v0.50.0-pre.ce2fefb (#374)

Automatically created pull-request in order to merge changes that were recently pushed to the test branch, back to main --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
hwinther · Nov 13, 2024 · 5d70a3c · 5d70a3c
1 parent bebc43b
commit 5d70a3c
Show file tree

Hide file tree

Showing 34 changed files with 1,788 additions and 1,046 deletions.
diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml
@@ -35,7 +35,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  DOTNET_VERSION: "8.0.x"
+  DOTNET_VERSION: "9.0.x"
   BACKEND_SOLUTION_PATH: "src/backend"
   BACKEND_SOLUTION_FILE: "Backend.sln"
   WORKFLOW_SHORT_NAME: "backend-ci"

diff --git a/.github/workflows/deploy-cd.yml b/.github/workflows/deploy-cd.yml
@@ -33,7 +33,7 @@ on:
 env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   TRAILING_AGENT_WORK_PATH: "/home/runner/work/test/test/"
-  DOTNET_VERSION: "8.0.x"
+  DOTNET_VERSION: "9.0.x"
   BACKEND_SOLUTION_PATH: "src/backend"
   BACKEND_SOLUTION_FILENAME: "Backend.sln"
   FRONTEND_PATH: "src/frontend"

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
@@ -3,32 +3,46 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "8.0.10",
+      "version": "9.0.0",
       "commands": [
         "dotnet-ef"
       ],
       "rollForward": false
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.3.11",
+      "version": "5.4.0",
       "commands": [
         "reportgenerator"
       ],
       "rollForward": false
     },
     "swashbuckle.aspnetcore.cli": {
-      "version": "6.9.0",
+      "version": "7.0.0",
       "commands": [
         "swagger"
       ],
       "rollForward": false
     },
     "dotnet-stryker": {
-      "version": "4.3.0",
+      "version": "4.4.1",
       "commands": [
         "dotnet-stryker"
       ],
       "rollForward": false
+    },
+    "dotnet-outdated-tool": {
+      "version": "4.6.4",
+      "commands": [
+        "dotnet-outdated"
+      ],
+      "rollForward": false
+    },
+    "refitter": {
+      "version": "1.4.0",
+      "commands": [
+        "refitter"
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/src/backend/ApiClient/ApiClient.csproj b/src/backend/ApiClient/ApiClient.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <Target Name="RefitGenerator" BeforeTargets="build" Condition="'$(Configuration)' == 'Debug'">
+    <Warning Code="DSAMPLE002" Text="Generating API client with refitter" />
+    <Exec Command="dotnet refitter ..\WebApi\swagger.json --namespace WebApi.Client --output WebApiClient.cs" />
+  </Target>
+
+  <ItemGroup>
+    <PackageReference Include="Refit" Version="8.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/backend/ApiClient/Program.cs b/src/backend/ApiClient/Program.cs
@@ -0,0 +1,5 @@
+using Refit;
+using WebApi.Client;
+
+var testApiClient = RestService.For<IExampleAPI>("https://localhost:44380");
+await testApiClient.Ping();