Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build_and_run_unit_tests_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,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
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/run_performance_tests_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.x
dotnet-version: 10.x

- name: Run benchmarks (PR branch)
run: dotnet run -c Release --framework net9.0 -- --filter "*"
run: dotnet run -c Release --framework net10.0 -- --filter "*"
working-directory: ./branch-code/csharp/PhoneNumbers.PerformanceTest

- name: Run benchmarks (main branch)
if: github.event_name == 'pull_request'
run: dotnet run -c Release --framework net9.0 -- --filter "*"
run: dotnet run -c Release --framework net10.0 -- --filter "*"
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to just merge this PR as is even though the CI is failing? It's just because net10 doesn't exist on main yet, which it will once this is merged. Or can do it as a two step process and leave this as net9.

working-directory: ./main-code/csharp/PhoneNumbers.PerformanceTest

- name: Stage benchmark artifact
Expand Down
5 changes: 5 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ 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 -InstallDir 'C:\Program Files\dotnet'
before_build:
- dotnet restore csharp -s https://api.nuget.org/v3/index.json
build_script:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netframework4.8;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>netframework4.8;net8.0;net9.0;net10.0</TargetFrameworks>
<NoWarn>$(NoWarn);1591;CA1014;CA1062;CA1707;CA1812;CA1852</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
Expand All @@ -10,7 +10,7 @@
<IsPackable>false</IsPackable>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PackageId>libphonenumber-csharp.extensions</PackageId>
<VersionPrefix>$(APPVEYOR_BUILD_VERSION)</VersionPrefix>
<Authors>Thomas Clegg</Authors>
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
<LangVersion>preview</LangVersion>
<PackageTags>phonenumber phone libphonenumber e164 e.164 international extensions</PackageTags>
<PackageProjectUrl>https://github.com/twcclegg/libphonenumber-csharp</PackageProjectUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>preview</LangVersion>
<RootNamespace>PhoneNumbers.MetadataBuilder</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netframework4.8;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>netframework4.8;net8.0;net9.0;net10.0</TargetFrameworks>
<ImplicitUsings>disable</ImplicitUsings>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions csharp/PhoneNumbers.Test/PhoneNumbers.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netframework4.8;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>netframework4.8;net8.0;net9.0;net10.0</TargetFrameworks>
<!--
Pin the C# language version so all TFMs (including netframework4.8, which the SDK
otherwise defaults to C# 7.3) accept post-7.3 syntax used by tests: `using var`
Expand All @@ -14,7 +14,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down Expand Up @@ -66,7 +66,7 @@
<TestResourcesGeocodingDir>$(MSBuildThisFileDirectory)..\..\resources/test/geocoding</TestResourcesGeocodingDir>
<TestResourcesCarrierDir>$(MSBuildThisFileDirectory)..\..\resources/test/carrier</TestResourcesCarrierDir>
<MetadataBuilderProject>$(MSBuildThisFileDirectory)..\PhoneNumbers.MetadataBuilder\PhoneNumbers.MetadataBuilder.csproj</MetadataBuilderProject>
<MetadataBuilderDll>$(MSBuildThisFileDirectory)..\PhoneNumbers.MetadataBuilder\bin\$(Configuration)\net9.0\PhoneNumbers.MetadataBuilder.dll</MetadataBuilderDll>
<MetadataBuilderDll>$(MSBuildThisFileDirectory)..\PhoneNumbers.MetadataBuilder\bin\$(Configuration)\net10.0\PhoneNumbers.MetadataBuilder.dll</MetadataBuilderDll>
</PropertyGroup>

<!--
Expand Down
6 changes: 3 additions & 3 deletions csharp/PhoneNumbers/PhoneNumbers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PackageId>libphonenumber-csharp</PackageId>
<VersionPrefix>$(APPVEYOR_BUILD_VERSION)</VersionPrefix>
<Authors>Patrick Mézard;Thomas Clegg;Jarrod Alexander;Google;libphonenumber contributors</Authors>
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
<LangVersion>preview</LangVersion>
<PackageTags>phonenumber phone libphonenumber e164 e.164 international</PackageTags>
<PackageProjectUrl>https://github.com/twcclegg/libphonenumber-csharp</PackageProjectUrl>
Expand All @@ -25,7 +25,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down Expand Up @@ -70,7 +70,7 @@
<BinaryCarrierDir>$(BaseIntermediateOutputPath)carrier</BinaryCarrierDir>
<ResourcesDir>$(MSBuildThisFileDirectory)..\..\resources/</ResourcesDir>
<MetadataBuilderProject>$(MSBuildThisFileDirectory)..\PhoneNumbers.MetadataBuilder\PhoneNumbers.MetadataBuilder.csproj</MetadataBuilderProject>
<MetadataBuilderDll>$(MSBuildThisFileDirectory)..\PhoneNumbers.MetadataBuilder\bin\$(Configuration)\net9.0\PhoneNumbers.MetadataBuilder.dll</MetadataBuilderDll>
<MetadataBuilderDll>$(MSBuildThisFileDirectory)..\PhoneNumbers.MetadataBuilder\bin\$(Configuration)\net10.0\PhoneNumbers.MetadataBuilder.dll</MetadataBuilderDll>
</PropertyGroup>

<!--
Expand Down
Loading