From 404401cfc2d2bd7a221c0701ab5bd8f76fec8a19 Mon Sep 17 00:00:00 2001 From: Collin Barrett <6483057+collinbarrett@users.noreply.github.com> Date: Sat, 15 Feb 2025 15:52:16 -0600 Subject: [PATCH] feat: upgrade to dotnet9 --- .github/workflows/codeql.yml | 5 +++++ .github/workflows/directory-migrate.yml | 14 ++++++++------ .github/workflows/directory.yml | 14 ++++++++------ .../FilterLists.Directory.Api.csproj | 6 +++--- .../FilterLists.Directory.Application.csproj | 2 +- ...ists.Directory.Infrastructure.Migrations.csproj | 2 +- .../FilterLists.Directory.Infrastructure.csproj | 4 ++-- .../FilterLists.AppHost/FilterLists.AppHost.csproj | 10 ++++++---- .../FilterLists.ServiceDefaults.csproj | 6 +++--- 9 files changed, 37 insertions(+), 26 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d724656cf..f668a303e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -27,6 +27,11 @@ jobs: - language: javascript-typescript build-mode: none steps: + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: "9.0.x" + # CodeQL C# autobuild doesn't (yet?) recognize .NET Aspire - if: matrix.language == 'csharp' run: | diff --git a/.github/workflows/directory-migrate.yml b/.github/workflows/directory-migrate.yml index 2d14d41ad..c88f207ae 100644 --- a/.github/workflows/directory-migrate.yml +++ b/.github/workflows/directory-migrate.yml @@ -62,12 +62,14 @@ jobs: git revert --no-edit $PREVIOUS_MIGRATION_HASH fi - # Disabled GH Actions cache for Dependabot. https://github.com/dependabot/dependabot-core/issues/1303 - # - name: Setup .NET - # uses: actions/setup-dotnet@v4 - # with: - # cache-dependency-path: services/Directory/FilterLists.Directory.Api/packages.lock.json - # cache: true + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: "9.0.x" + + # Disabled GH Actions cache for Dependabot. https://github.com/dependabot/dependabot-core/issues/1303 + # cache-dependency-path: services/Directory/FilterLists.Directory.Api/packages.lock.json + # cache: true - name: Install dotnet-ef run: dotnet tool install --global dotnet-ef diff --git a/.github/workflows/directory.yml b/.github/workflows/directory.yml index e55527867..6e6cb12c1 100644 --- a/.github/workflows/directory.yml +++ b/.github/workflows/directory.yml @@ -37,12 +37,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # Disabled GH Actions cache for Dependabot. https://github.com/dependabot/dependabot-core/issues/1303 - # - name: Setup .NET - # uses: actions/setup-dotnet@v4 - # with: - # cache-dependency-path: services/Directory/FilterLists.Directory.Api/packages.lock.json - # cache: true + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: "9.0.x" + + # Disabled GH Actions cache for Dependabot. https://github.com/dependabot/dependabot-core/issues/1303 + # cache-dependency-path: services/Directory/FilterLists.Directory.Api/packages.lock.json + # cache: true # - name: Restore # run: dotnet restore --locked-mode diff --git a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj index c25373a79..c376bd7e3 100644 --- a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj +++ b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable Recommended @@ -23,8 +23,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj index d2d328352..db9dcfbf4 100644 --- a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj +++ b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable Recommended diff --git a/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj index 9239b682c..cb59ca429 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj +++ b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable diff --git a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj index 89e38bd00..2d769516b 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj +++ b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj @@ -1,14 +1,14 @@  - net8.0 + net9.0 enable enable Recommended - + diff --git a/services/FilterLists.AppHost/FilterLists.AppHost.csproj b/services/FilterLists.AppHost/FilterLists.AppHost.csproj index 507e6d90d..4bd93ff0e 100644 --- a/services/FilterLists.AppHost/FilterLists.AppHost.csproj +++ b/services/FilterLists.AppHost/FilterLists.AppHost.csproj @@ -1,8 +1,10 @@ + + Exe - net8.0 + net9.0 enable enable true @@ -15,8 +17,8 @@ - - + + - + \ No newline at end of file diff --git a/services/FilterLists.ServiceDefaults/FilterLists.ServiceDefaults.csproj b/services/FilterLists.ServiceDefaults/FilterLists.ServiceDefaults.csproj index 1efda18e3..9b7e409bc 100644 --- a/services/FilterLists.ServiceDefaults/FilterLists.ServiceDefaults.csproj +++ b/services/FilterLists.ServiceDefaults/FilterLists.ServiceDefaults.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable true @@ -12,8 +12,8 @@ - - + +