Skip to content

Commit be1cd25

Browse files
AlexNDRmacAlexNDRmac
committed
move to net 7/8
1 parent 25e17e2 commit be1cd25

File tree

8 files changed

+29
-27
lines changed

8 files changed

+29
-27
lines changed

Diff for: ‎.github/workflows/build_and_test.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
matrix:
3232
include:
3333
# Ubuntu
34-
- { name: 'Linux .NET 5', os: ubuntu-22.04, framework: 'net5' }
34+
- { name: 'Linux .NET 8', os: ubuntu-22.04, framework: 'net8.0' }
3535
# macOs
36-
- { name: 'macOS .NET 5', os: macos-13, framework: 'net5' }
36+
- { name: 'macOS .NET 8', os: macos-13, framework: 'net8.0' }
3737
# Windows
38-
- { name: 'Windows .NET Core 3', os: windows-latest, framework: 'netcoreapp3.1' }
39-
- { name: 'Windows .NET 5', os: windows-latest, framework: 'net5' }
40-
- { name: 'Windows .NET 4.5', os: windows-latest, framework: 'net45' }
38+
- { name: 'Windows .NET 7', os: windows-latest, framework: 'net7.0' }
39+
- { name: 'Windows .NET 8', os: windows-latest, framework: 'net8.0' }
40+
- { name: 'Windows .NET 4.5', os: windows-latest, framework: 'net45' }
4141

4242
env:
4343
COREHOST_TRACE: false
@@ -60,10 +60,10 @@ jobs:
6060

6161
- name: Setup .NET SDK Version for Target Framework
6262
run: |
63-
If ("${{ matrix.framework }}" -eq "netcoreapp3.1") {
64-
Write-Output "DOTNET_SDK_VERSION=3.1.x" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
65-
} ElseIf ("${{ matrix.framework }}" -eq "net5") {
66-
Write-Output "DOTNET_SDK_VERSION=5.0.x" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
63+
If ("${{ matrix.framework }}" -eq "net7.0") {
64+
Write-Output "DOTNET_SDK_VERSION=7.0.x" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
65+
} ElseIf ("${{ matrix.framework }}" -eq "net8.0") {
66+
Write-Output "DOTNET_SDK_VERSION=8.0.x" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
6767
}
6868
6969
- name: Setup .NET SDK
@@ -111,10 +111,10 @@ jobs:
111111

112112
- name: Setup Code Coverage report flags
113113
run: |
114-
If ("${{ matrix.framework }}" -eq "netcoreapp3.1") {
115-
Write-Output "TARGET_FRAMEWORK=netstandard12" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
116-
} ElseIf ("${{ matrix.framework }}" -eq "net5") {
114+
If ("${{ matrix.framework }}" -eq "net7.0") {
117115
Write-Output "TARGET_FRAMEWORK=netstandard20" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
116+
} ElseIf ("${{ matrix.framework }}" -eq "net8.0") {
117+
Write-Output "TARGET_FRAMEWORK=netstandard21" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
118118
} Else {
119119
Write-Output "TARGET_FRAMEWORK=net45" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
120120
}

Diff for: ‎.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v4
2626

27-
- name: Setup .NET 5
27+
- name: Setup .NET 8
2828
uses: actions/setup-dotnet@v4
2929
with:
3030
dotnet-version: |
31-
3.1.x
32-
5.0.x
31+
7.0.x
32+
8.0.x
3333
3434
- name: Setup Nuget Cache
3535
uses: actions/cache@v4

Diff for: ‎.netconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[ReportGenerator]
2-
reports = SignNow.Net.Test/bin/Debug/netcoreapp3.1/coverage.netcoreapp3.1.opencover.xml
32
reports = SignNow.Net.Test/bin/Debug/net45/coverage.net45.opencover.xml
4-
reports = SignNow.Net.Test/bin/Debug/net5/coverage.net5.opencover.xml
3+
reports = SignNow.Net.Test/bin/Debug/net7.0/coverage.net7.0.opencover.xml
4+
reports = SignNow.Net.Test/bin/Debug/net8.0/coverage.net8.0.opencover.xml
55
targetdir = "SignNow.Net.Test/bin/coverage-html"
66
reporttypes = Html;HtmlSummary

Diff for: ‎SignNow.Net.Examples/SignNow.Net.Examples.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\netfx.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>net5</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66

77
<IsPackable>false</IsPackable>
88
</PropertyGroup>

Diff for: ‎SignNow.Net.Test/SignNow.Net.Test.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\SignNow.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp3.1;net45;net5</TargetFrameworks>
6+
<TargetFrameworks>net45;net7.0;net8.0</TargetFrameworks>
77
<IsPackable>false</IsPackable>
88
<NeutralLanguage>en-US</NeutralLanguage>
99
</PropertyGroup>
@@ -31,12 +31,12 @@
3131
<PackageReference Include="Bogus" Version="35.6.1" />
3232
</ItemGroup>
3333

34-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
35-
<ProjectReference Include="..\SignNow.Net\SignNow.Net.csproj" Properties="TargetFramework=netstandard1.2" />
34+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
35+
<ProjectReference Include="..\SignNow.Net\SignNow.Net.csproj" Properties="TargetFramework=netstandard2.0" />
3636
</ItemGroup>
3737

38-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5' ">
39-
<ProjectReference Include="..\SignNow.Net\SignNow.Net.csproj" Properties="TargetFramework=netstandard2.0" />
38+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
39+
<ProjectReference Include="..\SignNow.Net\SignNow.Net.csproj" Properties="TargetFramework=netstandard2.1" />
4040
</ItemGroup>
4141

4242
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">

Diff for: ‎SignNow.Net.Test/UnitTests/Helpers/UserAgentSdkHeadersTest.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ public void FrameworkVersionTest()
7878

7979
#if NETCOREAPP3_0 || NETCOREAPP3_1
8080
expectedVersion = "3.";
81-
#elif NET5_0
82-
expectedVersion = "5.";
81+
#elif NET7_0
82+
expectedVersion = "7.";
83+
#elif NET8_0
84+
expectedVersion = "8.";
8385
#endif
8486

8587
StringAssert.StartsWith(SdkRuntime.FrameworkVersion(), expectedVersion);

Diff for: ‎SignNow.Net.Test/UnitTests/Services/SignNowClientTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public async Task ShouldHandleTimeoutExceptionFromHttpClient()
128128

129129
StringAssert.Matches(exception.Message, new Regex(errorMessage.TrimEnd('s') + "\\d\\.\\d+s"));
130130

131-
#if NET5_0
131+
#if !NET45
132132
StringAssert.Contains(exception.InnerException?.Message, "The request was canceled due to the configured HttpClient.Timeout of 1 seconds elapsing.");
133133
StringAssert.Contains(exception.InnerException?.InnerException?.Message, "A task was canceled.");
134134
#else

Diff for: ‎SignNow.Net/SignNow.Net.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\SignNow.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netstandard1.2;netstandard2.0;net45</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;netstandard2.1;net45</TargetFrameworks>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<NeutralLanguage>en-US</NeutralLanguage>
99
<PackageId>SignNow.NET</PackageId>

0 commit comments

Comments
 (0)