From fc317a2ba6d7fc057161d98b5a648393fcf30fec Mon Sep 17 00:00:00 2001 From: Wilson Mun <30316250+wmundev@users.noreply.github.com> Date: Wed, 6 May 2026 23:29:42 +1000 Subject: [PATCH 1/3] feat: add dotnet 10 support --- .github/workflows/build_and_run_unit_tests_linux.yml | 6 +++--- .github/workflows/codeql.yml | 2 +- .../workflows/run_all_tests_and_upload_code_coverage.yml | 2 +- .github/workflows/run_performance_tests_windows.yml | 4 ++-- appveyor.yml | 7 +++++++ .../PhoneNumbers.Extensions.Test.csproj | 4 ++-- .../PhoneNumbers.Extensions/PhoneNumbers.Extensions.csproj | 2 +- .../PhoneNumbers.MetadataBuilder.csproj | 2 +- .../PhoneNumbers.PerformanceTest.csproj | 4 ++-- csharp/PhoneNumbers.Test/PhoneNumbers.Test.csproj | 6 +++--- csharp/PhoneNumbers/PhoneNumbers.csproj | 6 +++--- 11 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build_and_run_unit_tests_linux.yml b/.github/workflows/build_and_run_unit_tests_linux.yml index 5f0182fd..c7391daa 100644 --- a/.github/workflows/build_and_run_unit_tests_linux.yml +++ b/.github/workflows/build_and_run_unit_tests_linux.yml @@ -14,13 +14,13 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.x + dotnet-version: 10.x - name: Restore dependencies run: dotnet restore working-directory: ./csharp - name: Build solution run: dotnet build --no-restore working-directory: ./csharp - - name: Test solution targeting dotnet9.0 only - run: dotnet test --no-build --verbosity normal -p:TargetFrameworks=net9.0 + - name: Test solution targeting dotnet10.0 only + run: dotnet test --no-build --verbosity normal -p:TargetFrameworks=net10.0 working-directory: ./csharp diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d54fad0f..50070020 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,7 +40,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.x + dotnet-version: 10.x - name: Initialize CodeQL uses: github/codeql-action/init@v4 with: diff --git a/.github/workflows/run_all_tests_and_upload_code_coverage.yml b/.github/workflows/run_all_tests_and_upload_code_coverage.yml index 0ab1fa02..6e43670b 100644 --- a/.github/workflows/run_all_tests_and_upload_code_coverage.yml +++ b/.github/workflows/run_all_tests_and_upload_code_coverage.yml @@ -15,7 +15,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.x + dotnet-version: 10.x - name: Run tests run: dotnet test csharp/PhoneNumbers.sln --configuration Release --verbosity normal --collect:"XPlat Code Coverage" --results-directory ./coverage - name: Upload coverage reports to Codecov diff --git a/.github/workflows/run_performance_tests_windows.yml b/.github/workflows/run_performance_tests_windows.yml index e633e82c..2c0ee05c 100644 --- a/.github/workflows/run_performance_tests_windows.yml +++ b/.github/workflows/run_performance_tests_windows.yml @@ -15,7 +15,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.x + dotnet-version: 10.x - name: Run performance tests - run: dotnet run -c Release --framework net9.0 -- --filter "*" + run: dotnet run -c Release --framework net10.0 -- --filter "*" working-directory: ./csharp/PhoneNumbers.PerformanceTest diff --git a/appveyor.yml b/appveyor.yml index e88493b1..5735e168 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,6 +22,13 @@ pull_requests: branches: only: - main +install: + - ps: | + $ProgressPreference = 'SilentlyContinue' + Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -OutFile "$env:TEMP\dotnet-install.ps1" + & "$env:TEMP\dotnet-install.ps1" -Channel 10.0 + $env:PATH = "$env:LOCALAPPDATA\Microsoft\dotnet;" + $env:PATH + [Environment]::SetEnvironmentVariable('PATH', $env:PATH, 'Machine') before_build: - dotnet restore csharp -s https://api.nuget.org/v3/index.json build_script: diff --git a/csharp/PhoneNumbers.Extensions.Test/PhoneNumbers.Extensions.Test.csproj b/csharp/PhoneNumbers.Extensions.Test/PhoneNumbers.Extensions.Test.csproj index da5e403e..393b8fe5 100644 --- a/csharp/PhoneNumbers.Extensions.Test/PhoneNumbers.Extensions.Test.csproj +++ b/csharp/PhoneNumbers.Extensions.Test/PhoneNumbers.Extensions.Test.csproj @@ -1,7 +1,7 @@ - netframework4.8;net8.0;net9.0 + netframework4.8;net8.0;net9.0;net10.0 $(NoWarn);1591;CA1014;CA1062;CA1707 true true @@ -10,7 +10,7 @@ false - + enable diff --git a/csharp/PhoneNumbers.Extensions/PhoneNumbers.Extensions.csproj b/csharp/PhoneNumbers.Extensions/PhoneNumbers.Extensions.csproj index 01875208..093b3a3f 100644 --- a/csharp/PhoneNumbers.Extensions/PhoneNumbers.Extensions.csproj +++ b/csharp/PhoneNumbers.Extensions/PhoneNumbers.Extensions.csproj @@ -7,7 +7,7 @@ libphonenumber-csharp.extensions $(APPVEYOR_BUILD_VERSION) Thomas Clegg - netstandard2.0;net8.0;net9.0 + netstandard2.0;net8.0;net9.0;net10.0 preview phonenumber phone libphonenumber e164 e.164 international extensions https://github.com/twcclegg/libphonenumber-csharp diff --git a/csharp/PhoneNumbers.MetadataBuilder/PhoneNumbers.MetadataBuilder.csproj b/csharp/PhoneNumbers.MetadataBuilder/PhoneNumbers.MetadataBuilder.csproj index f54267c5..9a1c7480 100644 --- a/csharp/PhoneNumbers.MetadataBuilder/PhoneNumbers.MetadataBuilder.csproj +++ b/csharp/PhoneNumbers.MetadataBuilder/PhoneNumbers.MetadataBuilder.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 enable preview PhoneNumbers.MetadataBuilder diff --git a/csharp/PhoneNumbers.PerformanceTest/PhoneNumbers.PerformanceTest.csproj b/csharp/PhoneNumbers.PerformanceTest/PhoneNumbers.PerformanceTest.csproj index c3af86af..a34eea02 100644 --- a/csharp/PhoneNumbers.PerformanceTest/PhoneNumbers.PerformanceTest.csproj +++ b/csharp/PhoneNumbers.PerformanceTest/PhoneNumbers.PerformanceTest.csproj @@ -2,11 +2,11 @@ Exe - netframework4.8;net8.0;net9.0 + netframework4.8;net8.0;net9.0;net10.0 disable - + enable diff --git a/csharp/PhoneNumbers.Test/PhoneNumbers.Test.csproj b/csharp/PhoneNumbers.Test/PhoneNumbers.Test.csproj index 583bee14..c8dd1c98 100644 --- a/csharp/PhoneNumbers.Test/PhoneNumbers.Test.csproj +++ b/csharp/PhoneNumbers.Test/PhoneNumbers.Test.csproj @@ -1,7 +1,7 @@ - netframework4.8;net8.0;net9.0 + netframework4.8;net8.0;net9.0;net10.0