Update the project files for .NET Core 2.0

stephan-tolksdorf · Aug 20, 2017 · 7b69fc9 · 7b69fc9
1 parent beb56e1
commit 7b69fc9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -16,7 +16,7 @@
         {
             "taskName": "Build .NET Core Test (Config: Debug-LowTrust)",
             "suppressTaskName": true,
-            "args": ["build", "Test", "-c", "Debug-LowTrust", "-f", "netcoreapp1.1"],
+            "args": ["build", "Test", "-c", "Debug-LowTrust", "-f", "netcoreapp2.0"],
             "isBuildCommand": true,
             "showOutput": "silent",
             "problemMatcher": "$msCompile"
@@ -38,7 +38,7 @@
         {
             "taskName": "Test .NET  Core (Config: Debug-LowTrust)",
             "suppressTaskName": true,
-            "args": [ "Test/bin/Debug-LowTrust/netcoreapp1.1/Test.dll" ],
+            "args": [ "Test/bin/Debug-LowTrust/netcoreapp2.0/Test.dll" ],
             "isTestCommand": true,
             "showOutput": "always"
         },

diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets
@@ -32,7 +32,7 @@
     <TargetFrameworks Condition="'$(OutputType)' != 'Exe'">netstandard1.6</TargetFrameworks>
     <TargetFrameworks Condition="'$(OutputType)' != 'Exe' and '$(CoreOnNonWin)' == 'false'">$(TargetFrameworks);net40-client</TargetFrameworks>
     <TargetFrameworks Condition="'$(OutputType)' != 'Exe' and '$(FSharpPortableLanguageTargets)' != ''">$(TargetFrameworks);portable-net45+win8+wp8+wpa81</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OutputType)' == 'Exe'">netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OutputType)' == 'Exe'">netcoreapp2.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OutputType)' == 'Exe' and '$(CoreOnNonWin)' == 'false'">$(TargetFrameworks);net45</TargetFrameworks>
   </PropertyGroup>
 
@@ -56,7 +56,9 @@
   <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == ''">
     <TargetFrameworkIdentifier Condition="'$(TargetFramework)' == 'net45'">.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkIdentifier Condition="'$(TargetFramework)' == 'netstandard1.6'">.NETStandard</TargetFrameworkIdentifier>
+    <TargetFrameworkIdentifier Condition="'$(TargetFramework)' == 'netstandard2.0'">.NETStandard</TargetFrameworkIdentifier>
     <TargetFrameworkIdentifier Condition="'$(TargetFramework)' == 'netcoreapp1.1'">.NETCoreApp</TargetFrameworkIdentifier>
+    <TargetFrameworkIdentifier Condition="'$(TargetFramework)' == 'netcoreapp2.0'">.NETCoreApp</TargetFrameworkIdentifier>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.fsproj'">

diff --git a/Samples/FParsec.Samples.Common.targets b/Samples/FParsec.Samples.Common.targets
@@ -21,7 +21,7 @@
     <TargetFrameworks>net45</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(LowTrust)' == 'true'">
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(CoreOnNonWin)' == 'false'">$(TargetFrameworks);net45</TargetFrameworks>
   </PropertyGroup>
 

diff --git a/Test/Test.fsproj b/Test/Test.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net40-client;net45;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net40-client;net45;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <Import Project="..\Build\FParsec.Common.targets" />
@@ -29,7 +29,7 @@
     <Compile Include="AllTests.fs" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
     <PackageReference Include="System.Globalization.Extensions" Version="4.*" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.*" />
   </ItemGroup>

diff --git a/pack.ps1 b/pack.ps1
@@ -16,7 +16,7 @@ $ErrorActionPreference = 'Stop'
 $configs = $('Release-LowTrust', 'Release')
 
 $testTargetFrameworks = @{'Release'          = $('net45', 'net40-client')
-                          'Release-LowTrust' = $('netcoreapp1.1', 'net45')}
+                          'Release-LowTrust' = $('netcoreapp2.0', 'net45')}
 $testPCL = $true
 
 function invoke([string] $cmd) {
@@ -41,7 +41,7 @@ foreach ($config in $configs) {
     invoke "msbuild FParsec /t:Build $props"
     invoke "msbuild Test /t:Build $props"
     foreach ($tf in $testTargetFrameworks[$config]) {
-        if ($tf -eq 'netcoreapp1.1') {
+        if ($tf.StartsWith('netcoreapp')) {
             invoke "dotnet .\Test\bin\$config\$tf\Test.dll"
         } else {
             invoke ".\Test\bin\$config\$tf\Test.exe"