Skip to content

Commit 7847c6f

Browse files
authored
Merge pull request #273 from twcclegg/net9
.net 9 migration
2 parents 8bb59ed + ac35768 commit 7847c6f

11 files changed

+21
-17
lines changed

.github/workflows/build_and_run_unit_tests_linux.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup .NET
1515
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: 8.x
17+
dotnet-version: 9.x
1818
- name: Add zip files required for running tests
1919
run: |
2020
(cd resources/geocoding; zip -r ../../resources/geocoding.zip *)
@@ -25,6 +25,6 @@ jobs:
2525
- name: Build solution
2626
run: dotnet build --no-restore
2727
working-directory: ./csharp
28-
- name: Test solution targeting dotnet8.0 only
29-
run: dotnet test --no-build --verbosity normal -p:TargetFrameworks=net8.0
28+
- name: Test solution targeting dotnet9.0 only
29+
run: dotnet test --no-build --verbosity normal -p:TargetFrameworks=net9.0
3030
working-directory: ./csharp

.github/workflows/create_new_release_on_new_metadata_update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET
1616
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 7.x
18+
dotnet-version: 9.x
1919
- name: Get new metadata information and create new GitHub release
2020
timeout-minutes: 30
2121
run: |

.github/workflows/run_all_tests_and_upload_code_coverage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET
1616
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 8.x
18+
dotnet-version: 9.x
1919
- name: Add zip files required for running tests
2020
run: |
2121
Compress-Archive -Path "resources\geocoding\*" -DestinationPath "resources\geocoding.zip"

.github/workflows/run_performance_tests_windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET
1616
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 8.x
18+
dotnet-version: 9.x
1919
- name: Run performance tests
20-
run: dotnet run -c Release --framework net8.0
20+
run: dotnet run -c Release --framework net9.0
2121
working-directory: ./csharp/PhoneNumbers.PerformanceTest

appveyor.yml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ pull_requests:
2222
branches:
2323
only:
2424
- main
25+
install:
26+
- ps: |
27+
Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1"
28+
& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '9.0.100' -InstallDir "$env:ProgramFiles\dotnet"
2529
before_build:
2630
- dotnet restore csharp -s https://api.nuget.org/v3/index.json
2731
- ps: Compress-Archive -Path "resources\geocoding\*" -DestinationPath "resources\geocoding.zip"

csharp/PhoneNumbers.Extensions.Test/PhoneNumbers.Extensions.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netframework4.8;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netframework4.8;net8.0;net9.0</TargetFrameworks>
55
<NoWarn>$(NoWarn);1591;CA1014;CA1062;CA1707</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>
@@ -10,7 +10,7 @@
1010
<IsPackable>false</IsPackable>
1111
</PropertyGroup>
1212

13-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0'">
13+
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
1414
<Nullable>enable</Nullable>
1515
</PropertyGroup>
1616

csharp/PhoneNumbers.Extensions/PhoneNumbers.Extensions.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageId>libphonenumber-csharp.extensions</PackageId>
88
<VersionPrefix>$(APPVEYOR_BUILD_VERSION)</VersionPrefix>
99
<Authors>Thomas Clegg</Authors>
10-
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
1111
<LangVersion>preview</LangVersion>
1212
<PackageTags>phonenumber phone libphonenumber e164 e.164 international extensions</PackageTags>
1313
<PackageProjectUrl>https://github.com/twcclegg/libphonenumber-csharp</PackageProjectUrl>

csharp/PhoneNumbers.PerformanceTest/PhoneNumbers.PerformanceTest.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netframework4.8;net6.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>netframework4.8;net8.0;net9.0</TargetFrameworks>
66
<ImplicitUsings>disable</ImplicitUsings>
77
</PropertyGroup>
88

9-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0'">
9+
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
1010
<Nullable>enable</Nullable>
1111
</PropertyGroup>
1212

csharp/PhoneNumbers.Test/PhoneNumbers.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netframework4.8;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netframework4.8;net8.0;net9.0</TargetFrameworks>
55
<AssemblyName>PhoneNumbers.Test</AssemblyName>
66
<PackageId>PhoneNumbers.Test</PackageId>
77
<DebugType>full</DebugType>
88
<NoWarn>$(NoWarn);CA1014;CA1707</NoWarn>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1010
</PropertyGroup>
1111

12-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0'">
12+
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
1313
<Nullable>enable</Nullable>
1414
</PropertyGroup>
1515

csharp/PhoneNumbers/PhoneNumbers.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageId>libphonenumber-csharp</PackageId>
88
<VersionPrefix>$(APPVEYOR_BUILD_VERSION)</VersionPrefix>
99
<Authors>Patrick Mézard;Thomas Clegg;Jarrod Alexander;Google;libphonenumber contributors</Authors>
10-
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
1111
<LangVersion>preview</LangVersion>
1212
<PackageTags>phonenumber phone libphonenumber e164 e.164 international</PackageTags>
1313
<PackageProjectUrl>https://github.com/twcclegg/libphonenumber-csharp</PackageProjectUrl>
@@ -25,7 +25,7 @@
2525
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2626
</PropertyGroup>
2727

28-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0'">
28+
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
2929
<Nullable>enable</Nullable>
3030
</PropertyGroup>
3131

lib/github-actions-metadata-update.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ cd ${GITHUB_ACTION_WORKING_DIRECTORY}
113113
cd csharp
114114
dotnet restore
115115
dotnet build --no-restore
116-
dotnet test --no-build --verbosity normal -p:TargetFrameworks=net8.0
116+
dotnet test --no-build --verbosity normal -p:TargetFrameworks=net9.0
117117
# Cleanup test dependencies
118118
rm -rf ${GITHUB_ACTION_WORKING_DIRECTORY}/resources/geocoding.zip
119119
rm -rf ${GITHUB_ACTION_WORKING_DIRECTORY}/resources/test/testgeocoding.zip

0 commit comments

Comments
 (0)