diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index 8007368..a7443cc 100644 --- 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 index 401c8a3..06d66bc 100644 --- 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 index aadaf83..be34fb5 100644 --- a/shared/NugetDistSample/NugetDistSample.csproj +++ b/shared/NugetDistSample/NugetDistSample.csproj @@ -1,11 +1,11 @@ Exe - net8.0 + net8.0;net9.0 enable enable nuget_distribution_example - 0.0.26 + 0.0.33 Hans Christian Winther-Sørensen WSH Distributing shared project files example diff --git a/shared/NugetDistSample/Program.cs b/shared/NugetDistSample/Program.cs index e970e9d..c5aa04e 100644 --- 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 "); + Console.WriteLine("Usage: NugetDistSample "); } return; diff --git a/shared/NugetDistSample/build/nuget_distribution_example.props b/shared/NugetDistSample/build/nuget_distribution_example.props index d385c1a..9c2fb22 100644 --- a/shared/NugetDistSample/build/nuget_distribution_example.props +++ b/shared/NugetDistSample/build/nuget_distribution_example.props @@ -1,11 +1,7 @@  - - + + \ No newline at end of file diff --git a/shared/NugetDistSample/packages.lock.json b/shared/NugetDistSample/packages.lock.json index 807ab82..ef181b7 100644 --- 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": {} } } \ No newline at end of file diff --git a/shared/NugetDistSample/readme.md b/shared/NugetDistSample/readme.md index 0a1d02c..4788b1c 100644 Binary files a/shared/NugetDistSample/readme.md and b/shared/NugetDistSample/readme.md differ diff --git a/src/backend/.config/dotnet-tools.json b/src/backend/.config/dotnet-tools.json index 8ea09fa..5fa870b 100644 --- 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 } } } \ No newline at end of file diff --git a/src/backend/Directory.Build.props b/src/backend/Directory.Build.props index 82a23a7..7d1c2a0 100644 --- a/src/backend/Directory.Build.props +++ b/src/backend/Directory.Build.props @@ -1,26 +1,29 @@ - - net8.0 - enable - enable - latest - true - true - true - true - win-x64;linux-musl-x64 - - true - 0.0.0.1 - 0.0.0.1 - 0.0.0.1-local-dev - + + net9.0 + enable + enable + latest + true + true + true + true + win-x64;linux-musl-x64 + + true + 0.0.0.1 + 0.0.0.1 + 0.0.0.1-local-dev + <_Parameter1>"$(DefineConstants)" - + + +