Skip to content

Commit f3683ae

Browse files
committed
Update some dependencies plus move to net8 SDK from net6
1 parent 28a6fe0 commit f3683ae

File tree

45 files changed

+21663
-22396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+21663
-22396
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,6 @@ $RECYCLE.BIN/
170170

171171
# MS Access database
172172
*.mdb
173+
174+
# Verify received diffs
175+
.received.txt

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": "6.0.404",
3+
"version": "8.0.100",
44
"rollForward": "latestFeature"
55
},
66
"projects": []

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-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
</PropertyGroup>

src/NHapi.SourceGeneration/Generators/EventMappingGenerator.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace NHapi.SourceGeneration.Generators
22
{
33
using System.Data.Common;
4-
using System.Data.Odbc;
54
using System.IO;
65
using System.Text;
76

src/NHapi.SourceGeneration/Generators/MessageGenerator.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ this file under either the MPL or the GPL.
2727
namespace NHapi.SourceGeneration.Generators
2828
{
2929
using System;
30-
using System.Collections;
3130
using System.Collections.Generic;
3231
using System.Data.Common;
33-
using System.Data.Odbc;
3432
using System.IO;
3533
using System.Text;
3634

src/NHapi.SourceGeneration/NHapi.SourceGeneration.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
19-
<PackageReference Include="System.Data.OleDb" Version="7.0.0" />
18+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
19+
<PackageReference Include="System.Data.OleDb" Version="8.0.0" />
2020
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>net461;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net8.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<LangVersion>latest</LangVersion>
77
</PropertyGroup>
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="NUnit" Version="3.14.0" />
19+
<PackageReference Include="NUnit" Version="4.0.1" />
2020
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2222
<PackageReference Include="TimeZoneConverter" Version="6.1.0" />
@@ -38,11 +38,13 @@
3838
<ProjectReference Include="..\..\src\NHapi.Model.V22\NHapi.Model.V22.csproj" />
3939
</ItemGroup>
4040

41-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
42-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.3">
41+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
42+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.3">
4343
<PrivateAssets>all</PrivateAssets>
4444
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4545
</PackageReference>
46+
<!-- can remove this with next version of nunit https://github.com/nunit/nunit/pull/4582 -->
47+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
4648
</ItemGroup>
4749

4850
</Project>

tests/NHapi.NUnit.SourceGeneration/Generators/EventMappingGeneratorTests.MakeAll_GeneratesAllEventMaps_21.verified.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
C:\DEV\nHapi\tests\NHapi.NUnit.SourceGeneration\bin\Debug\net6.0\basepath\NHapi.Model.V21\EventMapping\EventMap.properties:
2+
C:\DEV\nHapiNet\nHapi\tests\NHapi.NUnit.SourceGeneration\bin\Debug\net8.0\basepath\NHapi.Model.V21\EventMapping\EventMap.properties:
33
#event -> structure map for 2.1
44
#note: no mappings are defined for 2.1 and 2.2
55

tests/NHapi.NUnit.SourceGeneration/Generators/EventMappingGeneratorTests.MakeAll_GeneratesAllEventMaps_22.verified.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
C:\DEV\nHapi\tests\NHapi.NUnit.SourceGeneration\bin\Debug\net6.0\basepath\NHapi.Model.V22\EventMapping\EventMap.properties:
2+
C:\DEV\nHapiNet\nHapi\tests\NHapi.NUnit.SourceGeneration\bin\Debug\net8.0\basepath\NHapi.Model.V22\EventMapping\EventMap.properties:
33
#event -> structure map for 2.2
44
#note: no mappings are defined for 2.1 and 2.2
55

tests/NHapi.NUnit.SourceGeneration/Generators/EventMappingGeneratorTests.MakeAll_GeneratesAllEventMaps_23.verified.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
C:\DEV\nHapi\tests\NHapi.NUnit.SourceGeneration\bin\Debug\net6.0\basepath\NHapi.Model.V23\EventMapping\EventMap.properties:
2+
C:\DEV\nHapiNet\nHapi\tests\NHapi.NUnit.SourceGeneration\bin\Debug\net8.0\basepath\NHapi.Model.V23\EventMapping\EventMap.properties:
33
#event -> structure map for 2.3
44
ADT_A01 ADT_A01
55
ADT_A02 ADT_A02

0 commit comments

Comments
 (0)