Skip to content

Commit a37f3bc

Browse files
milkshakeukmilkshakeuk
committed
Add back support for netframework3.5
1 parent f581228 commit a37f3bc

File tree

22 files changed

+379
-118
lines changed

22 files changed

+379
-118
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ All notable changes to this project will be documented in this file.
33

44
## Upcoming Release
55
###
6-
-
6+
## [3.0.0.0] - TBC
7+
### Added (Submitted by haydenhall and milkshakeuk)
8+
- Update project to add support for netstandard2.0 #61
79

8-
## [2.6.0.0] - 2019-03-25
9-
### Fixes (Submitted by haydenhall and milkshakeuk)
10-
- Update project to support netstandard2.0 #61
10+
11+
## Previous Releases
12+
###
1113

1214
## [2.5.0.6] - 2016-09-13
1315
### Fixes

‎NHapi20/ModelGenerator/ModelGenerator.csproj‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,55 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net461</TargetFramework>
5+
<TargetFrameworks>net35;netcoreapp3.1</TargetFrameworks>
66
<AssemblyOriginatorKeyFile>..\NHapi.snk</AssemblyOriginatorKeyFile>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Args" Version="1.2.1" />
11+
<None Include="..\NHapi.snk" Link="NHapi.snk" />
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<None Include="..\NHapi.snk" Link="NHapi.snk" />
15+
<Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
19+
<Compile Update="Properties\Settings.Designer.cs">
20+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
21+
<AutoGen>True</AutoGen>
22+
<DependentUpon>Settings.settings</DependentUpon>
23+
</Compile>
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<None Update="Properties\Settings.settings">
28+
<Generator>SettingsSingleFileGenerator</Generator>
29+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
30+
</None>
2031
</ItemGroup>
2132

2233
<ItemGroup>
2334
<ProjectReference Include="..\NHapi.Base\NHapi.Base.csproj" />
2435
</ItemGroup>
2536

37+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
38+
<PackageReference Include="Args" Version="1.2.1" />
39+
</ItemGroup>
40+
41+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
42+
<PackageReference Include="Args" Version="1.1.2" />
43+
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
44+
</ItemGroup>
45+
46+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
47+
<Reference Include="Args">
48+
<HintPath>..\packages\Args.1.1.2\lib\Net35\Args.dll</HintPath>
49+
</Reference>
50+
<Reference Include="System" />
51+
<Reference Include="System.configuration" />
52+
<Reference Include="System.Data" />
53+
<Reference Include="System.Xml" />
54+
</ItemGroup>
55+
2656
</Project>

‎NHapi20/ModelGenerator/Properties/Settings.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎NHapi20/NHapi.Base/NHapi.Base.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
<AssemblyOriginatorKeyFile>..\NHapi.snk</AssemblyOriginatorKeyFile>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<NoWarn>1591</NoWarn>
89
</PropertyGroup>
910

1011
<ItemGroup>
@@ -15,9 +16,20 @@
1516
<Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
1617
</ItemGroup>
1718

18-
<ItemGroup>
19-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
20-
<PackageReference Include="System.Data.Odbc" Version="4.6.0-preview3.19128.7" />
19+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
21+
<PackageReference Include="System.Data.Odbc" Version="4.7.0" />
22+
</ItemGroup>
23+
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
25+
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
26+
</ItemGroup>
27+
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
29+
<Reference Include="System" />
30+
<Reference Include="System.configuration" />
31+
<Reference Include="System.Data" />
32+
<Reference Include="System.Xml" />
2133
</ItemGroup>
2234

2335
</Project>

‎NHapi20/NHapi.Model.V21/NHapi.Model.V21.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
<AssemblyOriginatorKeyFile>..\NHapi.snk</AssemblyOriginatorKeyFile>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<NoWarn>1591</NoWarn>
89
</PropertyGroup>
910

1011
<ItemGroup>
@@ -23,4 +24,14 @@
2324
<ProjectReference Include="..\NHapi.Base\NHapi.Base.csproj" />
2425
</ItemGroup>
2526

27+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
28+
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
32+
<Reference Include="System" />
33+
<Reference Include="System.Data" />
34+
<Reference Include="System.Xml" />
35+
</ItemGroup>
36+
2637
</Project>

‎NHapi20/NHapi.Model.V22/NHapi.Model.V22.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
<AssemblyOriginatorKeyFile>..\NHapi.snk</AssemblyOriginatorKeyFile>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<NoWarn>1591</NoWarn>
89
</PropertyGroup>
910

1011
<ItemGroup>
@@ -23,4 +24,14 @@
2324
<ProjectReference Include="..\NHapi.Base\NHapi.Base.csproj" />
2425
</ItemGroup>
2526

27+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
28+
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
32+
<Reference Include="System" />
33+
<Reference Include="System.Data" />
34+
<Reference Include="System.Xml" />
35+
</ItemGroup>
36+
2637
</Project>

‎NHapi20/NHapi.Model.V22_ZSegments/NHapi.Model.V22_ZSegments.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
<AssemblyOriginatorKeyFile>..\NHapi.snk</AssemblyOriginatorKeyFile>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<NoWarn>1591</NoWarn>
89
</PropertyGroup>
910

1011
<ItemGroup>
@@ -16,4 +17,14 @@
1617
<ProjectReference Include="..\NHapi.Model.V22\NHapi.Model.V22.csproj" />
1718
</ItemGroup>
1819

20+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
21+
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
22+
</ItemGroup>
23+
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
25+
<Reference Include="System" />
26+
<Reference Include="System.Data" />
27+
<Reference Include="System.Xml" />
28+
</ItemGroup>
29+
1930
</Project>

‎NHapi20/NHapi.Model.V23/NHapi.Model.V23.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
<AssemblyOriginatorKeyFile>..\NHapi.snk</AssemblyOriginatorKeyFile>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<NoWarn>1591</NoWarn>
89
</PropertyGroup>
910

1011
<ItemGroup>
@@ -23,4 +24,14 @@
2324
<ProjectReference Include="..\NHapi.Base\NHapi.Base.csproj" />
2425
</ItemGroup>
2526

27+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
28+
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
32+
<Reference Include="System" />
33+
<Reference Include="System.Data" />
34+
<Reference Include="System.Xml" />
35+
</ItemGroup>
36+
2637
</Project>

‎NHapi20/NHapi.Model.V231/NHapi.Model.V231.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
<AssemblyOriginatorKeyFile>..\NHapi.snk</AssemblyOriginatorKeyFile>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<NoWarn>1591</NoWarn>
89
</PropertyGroup>
910

1011
<ItemGroup>
@@ -23,4 +24,14 @@
2324
<ProjectReference Include="..\NHapi.Base\NHapi.Base.csproj" />
2425
</ItemGroup>
2526

27+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
28+
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
32+
<Reference Include="System" />
33+
<Reference Include="System.Data" />
34+
<Reference Include="System.Xml" />
35+
</ItemGroup>
36+
2637
</Project>

‎NHapi20/NHapi.Model.V24/NHapi.Model.V24.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
<AssemblyOriginatorKeyFile>..\NHapi.snk</AssemblyOriginatorKeyFile>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8+
<NoWarn>1591</NoWarn>
89
</PropertyGroup>
910

1011
<ItemGroup>
@@ -23,4 +24,14 @@
2324
<ProjectReference Include="..\NHapi.Base\NHapi.Base.csproj" />
2425
</ItemGroup>
2526

27+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
28+
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
32+
<Reference Include="System" />
33+
<Reference Include="System.Data" />
34+
<Reference Include="System.Xml" />
35+
</ItemGroup>
36+
2637
</Project>

0 commit comments

Comments
 (0)