From a5e3ed61cfb31ca6acb7ab3d052ebef3c01305dd Mon Sep 17 00:00:00 2001 From: Ricardo Cavalcanti <1876988+rcaval@users.noreply.github.com> Date: Thu, 27 Nov 2025 09:29:11 -0300 Subject: [PATCH 1/5] Migrate solution file to slnx format --- src/ConfIT.sln | 28 ---------------------------- src/ConfIT.slnx | 6 ++++++ 2 files changed, 6 insertions(+), 28 deletions(-) delete mode 100755 src/ConfIT.sln create mode 100644 src/ConfIT.slnx diff --git a/src/ConfIT.sln b/src/ConfIT.sln deleted file mode 100755 index 00e6a69..0000000 --- a/src/ConfIT.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfIT", "ConfIT\ConfIT.csproj", "{142A8513-7C48-491F-A95B-72AC1D8DAC0C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{909C3B25-10CF-4916-896D-018D595B58F4}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfIT.UnitTest", "..\test\ConfIT.UnitTest\ConfIT.UnitTest.csproj", "{87F66897-FD97-47FA-81AD-A6718D096C70}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {142A8513-7C48-491F-A95B-72AC1D8DAC0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {142A8513-7C48-491F-A95B-72AC1D8DAC0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {142A8513-7C48-491F-A95B-72AC1D8DAC0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {142A8513-7C48-491F-A95B-72AC1D8DAC0C}.Release|Any CPU.Build.0 = Release|Any CPU - {87F66897-FD97-47FA-81AD-A6718D096C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87F66897-FD97-47FA-81AD-A6718D096C70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87F66897-FD97-47FA-81AD-A6718D096C70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87F66897-FD97-47FA-81AD-A6718D096C70}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {142A8513-7C48-491F-A95B-72AC1D8DAC0C} = {909C3B25-10CF-4916-896D-018D595B58F4} - EndGlobalSection -EndGlobal diff --git a/src/ConfIT.slnx b/src/ConfIT.slnx new file mode 100644 index 0000000..ed11533 --- /dev/null +++ b/src/ConfIT.slnx @@ -0,0 +1,6 @@ + + + + + + From 50a06846f3f00b20ab0c38f5815524fefe9c3e0f Mon Sep 17 00:00:00 2001 From: Ricardo Cavalcanti <1876988+rcaval@users.noreply.github.com> Date: Thu, 27 Nov 2025 09:38:21 -0300 Subject: [PATCH 2/5] Update target frameworks and package references for .NET 10.0 support --- src/ConfIT/ConfIT.csproj | 22 +++++++++++++-------- src/global.json | 2 +- test/ConfIT.UnitTest/ConfIT.UnitTest.csproj | 10 +++++----- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/ConfIT/ConfIT.csproj b/src/ConfIT/ConfIT.csproj index b1539b7..19f5174 100755 --- a/src/ConfIT/ConfIT.csproj +++ b/src/ConfIT/ConfIT.csproj @@ -1,20 +1,26 @@ - net8.0;net7.0;net6.0 + net10.0;net9.0;net8.0;net7.0;net6.0 + + + + + + - + - + - + - - - - + + + + diff --git a/src/global.json b/src/global.json index a27a2b8..9a523dc 100644 --- a/src/global.json +++ b/src/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.0", + "version": "10.0.0", "rollForward": "latestMajor", "allowPrerelease": false } diff --git a/test/ConfIT.UnitTest/ConfIT.UnitTest.csproj b/test/ConfIT.UnitTest/ConfIT.UnitTest.csproj index 07c896a..e479747 100755 --- a/test/ConfIT.UnitTest/ConfIT.UnitTest.csproj +++ b/test/ConfIT.UnitTest/ConfIT.UnitTest.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable @@ -10,14 +10,14 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 413eb7804a27cceeef824a7b740ac74c16147de4 Mon Sep 17 00:00:00 2001 From: Ricardo Cavalcanti <1876988+rcaval@users.noreply.github.com> Date: Thu, 27 Nov 2025 10:04:49 -0300 Subject: [PATCH 3/5] Update package references in example projects --- .../JustAnotherService.csproj | 2 +- example/User.Api/User.Api.csproj | 22 +++++++++---------- .../User.ComponentTests.csproj | 12 +++++----- .../User.IntegrationTests.csproj | 8 +++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/example/JustAnotherService/JustAnotherService.csproj b/example/JustAnotherService/JustAnotherService.csproj index 5489a97..2c33bcb 100755 --- a/example/JustAnotherService/JustAnotherService.csproj +++ b/example/JustAnotherService/JustAnotherService.csproj @@ -7,7 +7,7 @@ - + diff --git a/example/User.Api/User.Api.csproj b/example/User.Api/User.Api.csproj index c367613..789f5f9 100755 --- a/example/User.Api/User.Api.csproj +++ b/example/User.Api/User.Api.csproj @@ -6,22 +6,22 @@ User.Api - - + + - + - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/example/User.ComponentTests/User.ComponentTests.csproj b/example/User.ComponentTests/User.ComponentTests.csproj index e5f535d..53f0af8 100755 --- a/example/User.ComponentTests/User.ComponentTests.csproj +++ b/example/User.ComponentTests/User.ComponentTests.csproj @@ -8,15 +8,15 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/example/User.IntegrationTests/User.IntegrationTests.csproj b/example/User.IntegrationTests/User.IntegrationTests.csproj index 0b57fe8..63e3e51 100755 --- a/example/User.IntegrationTests/User.IntegrationTests.csproj +++ b/example/User.IntegrationTests/User.IntegrationTests.csproj @@ -8,13 +8,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 210809d61269dcdb6033cf655a6945d2b4c02327 Mon Sep 17 00:00:00 2001 From: Ricardo Cavalcanti <1876988+rcaval@users.noreply.github.com> Date: Thu, 27 Nov 2025 10:52:28 -0300 Subject: [PATCH 4/5] Update GitHub Actions workflows to use .NET 10.0 and latest action versions --- .github/workflows/build.yml | 20 ++++++++++---------- .github/workflows/codeql-analysis.yml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ed8fdf..f3a01e2 100755 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,17 +20,17 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, 'skip')" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Install Dependencies - run: dotnet restore './src/ConfIT.sln' + run: dotnet restore './src/ConfIT.slnx' - name: Build - run: dotnet build './src/ConfIT.sln' --configuration Release --no-restore + run: dotnet build './src/ConfIT.slnx' --configuration Release --no-restore - name: Run ConfIT Unit Tests run: dotnet test './test/ConfIT.UnitTest/ConfIT.UnitTest.csproj' --configuration Release @@ -40,9 +40,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: dotnet-version: 8.0.x @@ -82,11 +82,11 @@ jobs: needs: Release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Get Release Version From Tag run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a12bf19..671ae76 100755 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL From 505b281cd4f98945075b4f1301fb93a4927106b8 Mon Sep 17 00:00:00 2001 From: Ricardo Cavalcanti <1876988+rcaval@users.noreply.github.com> Date: Thu, 27 Nov 2025 11:01:11 -0300 Subject: [PATCH 5/5] Adjust build.yml for new snlx file format; upgrade target frameworks in test project --- .github/workflows/build.yml | 4 +- src/ConfIT/ConfIT.csproj | 8 +--- src/global.json | 4 +- test/ConfIT.UnitTest/ConfIT.UnitTest.csproj | 46 ++++++++++----------- 4 files changed, 28 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3a01e2..734e157 100755 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,10 +30,10 @@ jobs: run: dotnet restore './src/ConfIT.slnx' - name: Build - run: dotnet build './src/ConfIT.slnx' --configuration Release --no-restore + run: dotnet build './src/ConfIT.slnx' --configuration Release --no-restore - name: Run ConfIT Unit Tests - run: dotnet test './test/ConfIT.UnitTest/ConfIT.UnitTest.csproj' --configuration Release + run: dotnet test './test/ConfIT.UnitTest/ConfIT.UnitTest.csproj' --configuration Release --logger "console;verbosity=normal" Example-Build-Test: needs: ConfIT-Build-Test diff --git a/src/ConfIT/ConfIT.csproj b/src/ConfIT/ConfIT.csproj index 19f5174..ffb3738 100755 --- a/src/ConfIT/ConfIT.csproj +++ b/src/ConfIT/ConfIT.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0;net7.0;net6.0 + net10.0;net9.0;net8.0 @@ -11,12 +11,6 @@ - - - - - - diff --git a/src/global.json b/src/global.json index 9a523dc..3dab80e 100644 --- a/src/global.json +++ b/src/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "10.0.0", - "rollForward": "latestMajor", + "version": "10.0.100", + "rollForward": "latestPatch", "allowPrerelease": false } } \ No newline at end of file diff --git a/test/ConfIT.UnitTest/ConfIT.UnitTest.csproj b/test/ConfIT.UnitTest/ConfIT.UnitTest.csproj index e479747..9343375 100755 --- a/test/ConfIT.UnitTest/ConfIT.UnitTest.csproj +++ b/test/ConfIT.UnitTest/ConfIT.UnitTest.csproj @@ -1,30 +1,30 @@ - - net10.0 - enable - enable + + net10.0;net9.0;net8.0 + enable + enable - false - true - + false + true + - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - + + +