Skip to content

Changing target frameworks to .NET standard 2.0 and .NET 4.0 #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 28, 2018
Merged

Changing target frameworks to .NET standard 2.0 and .NET 4.0 #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de800bd
Changing target frameworks to .NET standard 2.0 and .NET 4.0
tmilnthorp Sep 27, 2018
e1585b8
Updating build script
tmilnthorp Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Build/build-functions.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function Start-Tests {
# https://github.com/xunit/xunit/issues/1216
push-location $projectDir
# -nobuild <-- this gives an error, but might want to use this to avoid extra builds
dotnet xunit -configuration Release -framework netcoreapp1.1 -xml $reportFile -nobuild
dotnet xunit -configuration Release -framework netcoreapp2.0 -xml $reportFile -nobuild
if ($lastexitcode -ne 0) { exit 1 }
pop-location
}
Expand Down
2 changes: 1 addition & 1 deletion ...ation.JsonNet.CompatibilityTests/UnitsNet.Serialization.JsonNet.CompatibilityTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<RootNamespace>UnitsNet.Serialization.JsonNet.CompatibilityTests</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion UnitsNet.Serialization.JsonNet.Tests/UnitsNet.Serialization.JsonNet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<RootNamespace>UnitsNet.Serialization.JsonNet.Tests</RootNamespace>
</PropertyGroup>

Expand Down
4 changes: 1 addition & 3 deletions UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@

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

Expand Down
2 changes: 1 addition & 1 deletion UnitsNet.Tests/UnitsNet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<RootNamespace>UnitsNet.Tests</RootNamespace>
<NoWarn>CS1701;CS1702;CS1705;CS0618</NoWarn>
</PropertyGroup>
Expand Down
4 changes: 1 addition & 3 deletions UnitsNet/UnitsNet.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@

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

Expand Down