Skip to content

Commit d30d7f0

Browse files
authored
Merge pull request #264 from filipw/net8
Target .NET 8.0 and drop .NET 7.0
2 parents 9ca9181 + 494485f commit d30d7f0

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

.github/workflows/build_and_run_unit_tests_linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
- name: Build solution
2626
run: dotnet build --no-restore
2727
working-directory: ./csharp
28-
- name: Test solution targeting dotnet7.0 only
29-
run: dotnet test --no-build --verbosity normal -p:TargetFrameworks=net7.0
28+
- name: Test solution targeting dotnet8.0 only
29+
run: dotnet test --no-build --verbosity normal -p:TargetFrameworks=net8.0
3030
working-directory: ./csharp

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;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netframework4.8;net6.0;net8.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)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0'">
13+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.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;net7.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;net6.0;net8.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;net7.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>netframework4.8;net6.0;net8.0</TargetFrameworks>
66
<ImplicitUsings>disable</ImplicitUsings>
77
</PropertyGroup>
88

9-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0'">
9+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.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;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netframework4.8;net6.0;net8.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)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0'">
12+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.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;net7.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;net6.0;net8.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)' == 'net7.0'">
28+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.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=net7.0
116+
dotnet test --no-build --verbosity normal -p:TargetFrameworks=net8.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)