Skip to content

Commit c64a697

Browse files
tmilnthorpangularsen
authored andcommitted
Changing target frameworks to .NET standard 2.0 and .NET 4.0 (#488)
* Changing target frameworks to .NET standard 2.0 and .NET 4.0 * Updating build script
1 parent 794777d commit c64a697

File tree

6 files changed

+6
-10
lines changed

6 files changed

+6
-10
lines changed

Build/build-functions.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function Start-Tests {
6868
# https://github.com/xunit/xunit/issues/1216
6969
push-location $projectDir
7070
# -nobuild <-- this gives an error, but might want to use this to avoid extra builds
71-
dotnet xunit -configuration Release -framework netcoreapp1.1 -xml $reportFile -nobuild
71+
dotnet xunit -configuration Release -framework netcoreapp2.0 -xml $reportFile -nobuild
7272
if ($lastexitcode -ne 0) { exit 1 }
7373
pop-location
7474
}

UnitsNet.Serialization.JsonNet.CompatibilityTests/UnitsNet.Serialization.JsonNet.CompatibilityTests.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>netcoreapp1.1</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
55
<RootNamespace>UnitsNet.Serialization.JsonNet.CompatibilityTests</RootNamespace>
66
</PropertyGroup>
77

UnitsNet.Serialization.JsonNet.Tests/UnitsNet.Serialization.JsonNet.Tests.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>netcoreapp1.1</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
55
<RootNamespace>UnitsNet.Serialization.JsonNet.Tests</RootNamespace>
66
</PropertyGroup>
77

UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.Common.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020

2121
<!-- Assembly and msbuild properties -->
2222
<PropertyGroup>
23-
<TargetFrameworks>netstandard1.0;net35;net40</TargetFrameworks>
23+
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
2424
<RootNamespace>UnitsNet.Serialization.JsonNet</RootNamespace>
25-
<!-- Workaround for building with dotnet CLI and targeting .NET 3.5: https://github.com/Microsoft/msbuild/issues/1333#issuecomment-296346352 -->
26-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
2725
<NoWarn>CS1701;CS1702;CS1705;CS0618</NoWarn>
2826
</PropertyGroup>
2927

UnitsNet.Tests/UnitsNet.Tests.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>netcoreapp1.1</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
55
<RootNamespace>UnitsNet.Tests</RootNamespace>
66
<NoWarn>CS1701;CS1702;CS1705;CS0618</NoWarn>
77
</PropertyGroup>

UnitsNet/UnitsNet.Common.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020

2121
<!-- Assembly and msbuild properties -->
2222
<PropertyGroup>
23-
<TargetFrameworks>netstandard1.0;net35;net40</TargetFrameworks>
23+
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
2424
<RootNamespace>UnitsNet</RootNamespace>
25-
<!-- Workaround for building with dotnet CLI and targeting .NET 3.5: https://github.com/Microsoft/msbuild/issues/1333#issuecomment-296346352 -->
26-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
2725
<NoWarn>CS1701;CS1702;CS1705;CS0618;CS0809</NoWarn>
2826
</PropertyGroup>
2927

0 commit comments

Comments
 (0)