Skip to content

Commit fefcef7

Browse files
milkshakeukmilkshakeuk
committed
Update tools and build to net6.0
1 parent 0f92aec commit fefcef7

File tree

8 files changed

+42
-41
lines changed

8 files changed

+42
-41
lines changed

‎.github/workflows/build-status.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET Core
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: 5.0.301
18+
dotnet-version: 6.0.101
1919

2020
- name: Restore nHapi
2121
run: |
@@ -28,11 +28,11 @@ jobs:
2828
- name: Run tests for all target frameworks
2929
run: |
3030
dotnet test tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj -r TestResults -c Release -f net461 --no-restore --no-build
31-
dotnet test tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj -r TestResults -c Release -f net5.0--no-restore --no-build
31+
dotnet test tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj -r TestResults -c Release -f net6.0--no-restore --no-build
3232
dotnet test tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj -r TestResults -c Release -f net461 --no-restore --no-build
33-
dotnet test tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj -r TestResults -c Release -f net5.0 --no-restore --no-build
33+
dotnet test tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj -r TestResults -c Release -f net6.0 --no-restore --no-build
3434
dotnet test tests\NHapi.NUnit\NHapi.NUnit.csproj -r TestResults -c Release -f net461 --no-restore --no-build
35-
dotnet test tests\NHapi.NUnit\NHapi.NUnit.csproj -r TestResults -c Release -f net5.0 --no-restore --no-build
35+
dotnet test tests\NHapi.NUnit\NHapi.NUnit.csproj -r TestResults -c Release -f net6.0 --no-restore --no-build
3636
3737
build-and-test-linux:
3838
name: Build And Test Linux
@@ -44,7 +44,7 @@ jobs:
4444
- name: Setup .NET Core
4545
uses: actions/setup-dotnet@v1
4646
with:
47-
dotnet-version: 5.0.301
47+
dotnet-version: 6.0.101
4848

4949
- name: Restore nHapi
5050
run: |
@@ -56,9 +56,9 @@ jobs:
5656
5757
- name: Run tests for all target frameworks
5858
run: |
59-
dotnet test tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net5.0 --no-restore --no-build
60-
dotnet test tests/NHapi.NUnit.SourceGeneration/NHapi.NUnit.SourceGeneration.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net5.0 --no-restore --no-build
61-
dotnet test tests/NHapi.NUnit/NHapi.NUnit.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net5.0 --no-restore --no-build
59+
dotnet test tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net6.0 --no-restore --no-build
60+
dotnet test tests/NHapi.NUnit.SourceGeneration/NHapi.NUnit.SourceGeneration.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net6.0 --no-restore --no-build
61+
dotnet test tests/NHapi.NUnit/NHapi.NUnit.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net6.0 --no-restore --no-build
6262
6363
- name: Upload Code Coverage Report
6464
if: always()

‎.github/workflows/receive-pr.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup .NET Core
1414
uses: actions/setup-dotnet@v1
1515
with:
16-
dotnet-version: 5.0.301
16+
dotnet-version: 6.0.101
1717
- name: Restore nHapi
1818
run: |
1919
dotnet restore nHapi.sln --configfile build\.nuget\NuGet.config
@@ -25,11 +25,11 @@ jobs:
2525
- name: Run tests for all target frameworks
2626
run: |
2727
dotnet test tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --logger "trx;LogFilePrefix=TestResults" -r TestResults -c Release -f net461 --no-restore --no-build
28-
dotnet test tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --logger "trx;LogFilePrefix=TestResults" -r TestResults -c Release -f net5.0 --no-restore --no-build
28+
dotnet test tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --logger "trx;LogFilePrefix=TestResults" -r TestResults -c Release -f net6.0 --no-restore --no-build
2929
dotnet test tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj --logger "trx;LogFilePrefix=TestResults" -r TestResults -c Release -f net461 --no-restore --no-build
30-
dotnet test tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj --logger "trx;LogFilePrefix=TestResults" -r TestResults -c Release -f net5.0 --no-restore --no-build
30+
dotnet test tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj --logger "trx;LogFilePrefix=TestResults" -r TestResults -c Release -f net6.0 --no-restore --no-build
3131
dotnet test tests\NHapi.NUnit\NHapi.NUnit.csproj --logger "trx;LogFilePrefix=TestResults" -r TestResults -c Release -f net461 --no-restore --no-build
32-
dotnet test tests\NHapi.NUnit\NHapi.NUnit.csproj --logger "trx;LogFilePrefix=TestResults" -r TestResults -c Release -f net5.0 --no-restore --no-build
32+
dotnet test tests\NHapi.NUnit\NHapi.NUnit.csproj --logger "trx;LogFilePrefix=TestResults" -r TestResults -c Release -f net6.0 --no-restore --no-build
3333
3434
- name: Convert trx to junit
3535
if: ${{ success() || failure() }}
@@ -54,7 +54,7 @@ jobs:
5454
- name: Setup .NET Core
5555
uses: actions/setup-dotnet@v1
5656
with:
57-
dotnet-version: 5.0.301
57+
dotnet-version: 6.0.101
5858

5959
- name: Restore nHapi
6060
run: |
@@ -66,9 +66,9 @@ jobs:
6666
6767
- name: Run tests for all target frameworks
6868
run: |
69-
dotnet test tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net5.0 --no-restore --no-build
70-
dotnet test tests/NHapi.NUnit.SourceGeneration/NHapi.NUnit.SourceGeneration.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net5.0 --no-restore --no-build
71-
dotnet test tests/NHapi.NUnit/NHapi.NUnit.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net5.0 --no-restore --no-build
69+
dotnet test tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net6.0 --no-restore --no-build
70+
dotnet test tests/NHapi.NUnit.SourceGeneration/NHapi.NUnit.SourceGeneration.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net6.0 --no-restore --no-build
71+
dotnet test tests/NHapi.NUnit/NHapi.NUnit.csproj --collect:"XPlat Code Coverage" -r TestResults -c Release -f net6.0 --no-restore --no-build
7272
7373
- name: Upload Code Coverage Report
7474
if: always()

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "5.0.301",
3+
"version": "6.0.101",
44
"rollForward": "latestFeature"
55
},
66
"projects": []

‎nHapi.sln‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30621.155
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32014.148
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHapi.SourceGeneration", "src\NHapi.SourceGeneration\NHapi.SourceGeneration.csproj", "{FFC8315C-25E5-497A-86D2-6A4C411B1559}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHapi.SourceGeneration", "src\NHapi.SourceGeneration\NHapi.SourceGeneration.csproj", "{FFC8315C-25E5-497A-86D2-6A4C411B1559}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelGenerator", "src\ModelGenerator\ModelGenerator.csproj", "{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModelGenerator", "src\ModelGenerator\ModelGenerator.csproj", "{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC}"
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHapi.Model.V23", "src\NHapi.Model.V23\NHapi.Model.V23.csproj", "{796D663F-E12D-45C2-92E6-8FD050558A86}"
1111
EndProject
@@ -45,20 +45,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
4545
global.json = global.json
4646
NHapi.snk = NHapi.snk
4747
README.md = README.md
48+
stylecop.json = stylecop.json
4849
EndProjectSection
4950
EndProject
5051
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHapi.NUnit", "tests\NHapi.NUnit\NHapi.NUnit.csproj", "{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E}"
5152
EndProject
5253
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHapi.Base.NUnit", "tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj", "{C26D8167-FC47-4E37-9F26-130251782761}"
5354
EndProject
54-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHapi.NUnit.SourceGeneration", "tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj", "{003E674D-F010-4136-AB5A-C3EA6305A99F}"
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHapi.NUnit.SourceGeneration", "tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj", "{003E674D-F010-4136-AB5A-C3EA6305A99F}"
5556
EndProject
5657
Global
5758
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5859
Debug|Any CPU = Debug|Any CPU
5960
Release|Any CPU = Release|Any CPU
6061
EndGlobalSection
6162
GlobalSection(ProjectConfigurationPlatforms) = postSolution
63+
{FFC8315C-25E5-497A-86D2-6A4C411B1559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64+
{FFC8315C-25E5-497A-86D2-6A4C411B1559}.Debug|Any CPU.Build.0 = Debug|Any CPU
65+
{FFC8315C-25E5-497A-86D2-6A4C411B1559}.Release|Any CPU.ActiveCfg = Release|Any CPU
66+
{FFC8315C-25E5-497A-86D2-6A4C411B1559}.Release|Any CPU.Build.0 = Release|Any CPU
67+
{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68+
{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
70+
{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC}.Release|Any CPU.Build.0 = Release|Any CPU
6271
{796D663F-E12D-45C2-92E6-8FD050558A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6372
{796D663F-E12D-45C2-92E6-8FD050558A86}.Debug|Any CPU.Build.0 = Debug|Any CPU
6473
{796D663F-E12D-45C2-92E6-8FD050558A86}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -83,10 +92,6 @@ Global
8392
{4B3417BA-0090-4FA0-B04B-BB19563FC11C}.Debug|Any CPU.Build.0 = Debug|Any CPU
8493
{4B3417BA-0090-4FA0-B04B-BB19563FC11C}.Release|Any CPU.ActiveCfg = Release|Any CPU
8594
{4B3417BA-0090-4FA0-B04B-BB19563FC11C}.Release|Any CPU.Build.0 = Release|Any CPU
86-
{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87-
{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E}.Debug|Any CPU.Build.0 = Debug|Any CPU
88-
{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E}.Release|Any CPU.ActiveCfg = Release|Any CPU
89-
{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E}.Release|Any CPU.Build.0 = Release|Any CPU
9095
{BE6CDFAD-560E-44CC-B23B-87252DD4392C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9196
{BE6CDFAD-560E-44CC-B23B-87252DD4392C}.Debug|Any CPU.Build.0 = Debug|Any CPU
9297
{BE6CDFAD-560E-44CC-B23B-87252DD4392C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -119,18 +124,14 @@ Global
119124
{4CB07522-CEF0-44B4-B84A-110CAF19F5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
120125
{4CB07522-CEF0-44B4-B84A-110CAF19F5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
121126
{4CB07522-CEF0-44B4-B84A-110CAF19F5E0}.Release|Any CPU.Build.0 = Release|Any CPU
127+
{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
128+
{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E}.Debug|Any CPU.Build.0 = Debug|Any CPU
129+
{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E}.Release|Any CPU.ActiveCfg = Release|Any CPU
130+
{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E}.Release|Any CPU.Build.0 = Release|Any CPU
122131
{C26D8167-FC47-4E37-9F26-130251782761}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
123132
{C26D8167-FC47-4E37-9F26-130251782761}.Debug|Any CPU.Build.0 = Debug|Any CPU
124133
{C26D8167-FC47-4E37-9F26-130251782761}.Release|Any CPU.ActiveCfg = Release|Any CPU
125134
{C26D8167-FC47-4E37-9F26-130251782761}.Release|Any CPU.Build.0 = Release|Any CPU
126-
{FFC8315C-25E5-497A-86D2-6A4C411B1559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
127-
{FFC8315C-25E5-497A-86D2-6A4C411B1559}.Debug|Any CPU.Build.0 = Debug|Any CPU
128-
{FFC8315C-25E5-497A-86D2-6A4C411B1559}.Release|Any CPU.ActiveCfg = Release|Any CPU
129-
{FFC8315C-25E5-497A-86D2-6A4C411B1559}.Release|Any CPU.Build.0 = Release|Any CPU
130-
{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131-
{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
132-
{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
133-
{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC}.Release|Any CPU.Build.0 = Release|Any CPU
134135
{003E674D-F010-4136-AB5A-C3EA6305A99F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135136
{003E674D-F010-4136-AB5A-C3EA6305A99F}.Debug|Any CPU.Build.0 = Debug|Any CPU
136137
{003E674D-F010-4136-AB5A-C3EA6305A99F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -140,13 +141,14 @@ Global
140141
HideSolutionNode = FALSE
141142
EndGlobalSection
142143
GlobalSection(NestedProjects) = preSolution
144+
{FFC8315C-25E5-497A-86D2-6A4C411B1559} = {9FC71692-FA33-4213-8323-E53688BCA633}
145+
{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC} = {9FC71692-FA33-4213-8323-E53688BCA633}
143146
{796D663F-E12D-45C2-92E6-8FD050558A86} = {9FC71692-FA33-4213-8323-E53688BCA633}
144147
{5A080123-0597-46C3-AE78-2007EFB0DD68} = {9FC71692-FA33-4213-8323-E53688BCA633}
145148
{C5DE87CB-F026-4EB3-9CE8-5017BF3FB5CC} = {9FC71692-FA33-4213-8323-E53688BCA633}
146149
{B8909698-59BA-453F-A4BC-2F4F2612F853} = {9FC71692-FA33-4213-8323-E53688BCA633}
147150
{2AAFDC25-B3DF-4493-94A5-144D60122FEC} = {9FC71692-FA33-4213-8323-E53688BCA633}
148151
{4B3417BA-0090-4FA0-B04B-BB19563FC11C} = {9FC71692-FA33-4213-8323-E53688BCA633}
149-
{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E} = {65FE0FF9-296E-4C9B-A670-05D7AC663569}
150152
{BE6CDFAD-560E-44CC-B23B-87252DD4392C} = {9FC71692-FA33-4213-8323-E53688BCA633}
151153
{FFECB4DE-C192-4F95-9DC7-9D0A815D250A} = {9FC71692-FA33-4213-8323-E53688BCA633}
152154
{616C84EF-BE12-47A8-A524-D8230D572163} = {9FC71692-FA33-4213-8323-E53688BCA633}
@@ -155,9 +157,8 @@ Global
155157
{9B2038CA-D3DF-42E2-8F85-7C141D7CCD88} = {9FC71692-FA33-4213-8323-E53688BCA633}
156158
{5AEC7EA6-D02D-4DD5-82F4-D28ECF2BE1EA} = {9FC71692-FA33-4213-8323-E53688BCA633}
157159
{4CB07522-CEF0-44B4-B84A-110CAF19F5E0} = {9FC71692-FA33-4213-8323-E53688BCA633}
160+
{7C7C99F0-672B-4DB1-A125-5ED7A3ADF95E} = {65FE0FF9-296E-4C9B-A670-05D7AC663569}
158161
{C26D8167-FC47-4E37-9F26-130251782761} = {65FE0FF9-296E-4C9B-A670-05D7AC663569}
159-
{FFC8315C-25E5-497A-86D2-6A4C411B1559} = {9FC71692-FA33-4213-8323-E53688BCA633}
160-
{A9D49B55-5173-4FB2-B135-66BA9ECAE6CC} = {9FC71692-FA33-4213-8323-E53688BCA633}
161162
{003E674D-F010-4136-AB5A-C3EA6305A99F} = {65FE0FF9-296E-4C9B-A670-05D7AC663569}
162163
EndGlobalSection
163164
GlobalSection(ExtensibilityGlobals) = postSolution

‎src/ModelGenerator/ModelGenerator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net35;net5.0</TargetFrameworks>
5+
<TargetFrameworks>net35;net6.0</TargetFrameworks>
66
<AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
</PropertyGroup>

‎tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;net5.0</TargetFrameworks>
4+
<TargetFrameworks>net461;net6.0</TargetFrameworks>
55
<AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
</PropertyGroup>

‎tests/NHapi.NUnit.SourceGeneration/NHapi.NUnit.SourceGeneration.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net35;net5.0</TargetFrameworks>
4+
<TargetFrameworks>net35;net6.0</TargetFrameworks>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
</PropertyGroup>
77

‎tests/NHapi.NUnit/NHapi.NUnit.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;net5.0</TargetFrameworks>
4+
<TargetFrameworks>net461;net6.0</TargetFrameworks>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)