2.0.1: add .NETStandard 1.6

Author: natemcmaster

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.0.0-alpha.{build}+{branch}
+version: 2.0.1-rc.{build}+{branch}
 init:
   - git config --global core.autocrlf true
 clone_depth: 1

CommandLineUtils.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+VisualStudioVersion = 15.0.27004.2002
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{95D4B35E-0A21-4D64-8BAF-27DD6C019FC5}"
 EndProject
@@ -14,6 +14,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{60B2
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld", "samples\HelloWorld\HelloWorld.csproj", "{71521E54-158D-45D7-8746-4905E6B3EB21}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{509D6286-77FA-49C1-9EC6-7461DBE79536}"
+	ProjectSection(SolutionItems) = preProject
+		.appveyor.yml = .appveyor.yml
+		.editorconfig = .editorconfig
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		build.cmd = build.cmd
+		build.ps1 = build.ps1
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+		LICENSE.txt = LICENSE.txt
+		NOTICE.txt = NOTICE.txt
+		NuGet.config = NuGet.config
+		README.md = README.md
+		version.props = version.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

Directory.Build.props

@@ -20,6 +20,8 @@
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+    <PackageReleaseNotes>2.0.1: Add .NETStandard 1.6 to the list of supported frameworks.</PackageReleaseNotes>
   </PropertyGroup>
 
 </Project>

build.ps1

@@ -34,11 +34,8 @@ $artifacts = "$PSScriptRoot/artifacts/"
 Remove-Item -Recurse $artifacts -ErrorAction Ignore
 
 exec dotnet restore @MSBuildArgs
-exec dotnet pack `
-    -c $Configuration `
-    -o $artifacts `
-    @MSBuildArgs
-exec dotnet test `
-    -c $Configuration `
+exec dotnet build --no-restore -c $Configuration
+exec dotnet pack --no-restore --no-build -c $Configuration -o $artifacts @MSBuildArgs
+exec dotnet test --no-restore --no-build -c $Configuration `
     "$PSScriptRoot/test/CommandLineUtils.Tests/McMaster.Extensions.CommandLineUtils.Tests.csproj" `
     @MSBuildArgs

src/CommandLineUtils/McMaster.Extensions.CommandLineUtils.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;;netstandard1.6;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>true</IsPackable>
     <Description>Command-line parsing API. A community-maintained fork of Microsoft.Extensions.CommandLineUtils, plus extras.
@@ -17,4 +17,10 @@ McMaster.Extensions.CommandLineUtils.ArgumentEscaper
     <IncludeSource>true</IncludeSource>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.6'">
+    <PackageReference Include="System.AppContext" Version="4.3.0" />
+    <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
+    <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
+  </ItemGroup>
+
 </Project>

src/CommandLineUtils/Utilities/DotNetExe.cs

@@ -38,7 +38,7 @@ private static string TryFindDotNetExePath()
         {
 #if NET45
             return "dotnet.exe";
-#elif NETSTANDARD2_0
+#elif (NETSTANDARD1_6 || NETSTANDARD2_0)
             var fileName = FileName;
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -78,6 +78,8 @@ private static string TryFindDotNetExePath()
             return File.Exists(muxer)
                 ? muxer
                 : null;
+#else
+#error Update target frameworks
 #endif
         }
     }

test/CommandLineUtils.Tests/DotNetExeTests.cs

@@ -2,9 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 // This file has been modified from the original form. See Notice.txt in the project root for more information.
 
-#if NETCOREAPP2_0
+#if (NETCOREAPP1_0 || NETCOREAPP2_0)
 using System.IO;
-using System.Runtime.InteropServices;
 using Xunit;
 
 namespace McMaster.Extensions.CommandLineUtils.Tests

test/CommandLineUtils.Tests/McMaster.Extensions.CommandLineUtils.Tests.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform(Windows))">$(TargetFrameworks);net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,9 +11,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="Moq" Version="4.7.99" />
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="Moq" Version="4.7.142" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
 </Project>

test/CommandLineUtils.Tests/xunit.runner.json

@@ -0,0 +1,3 @@
+{
+	"methodDisplay": "method"
+}

version.props

@@ -1,14 +1,16 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.0.0</VersionPrefix>
+    <VersionPrefix>2.0.1</VersionPrefix>
+    <!-- <VersionSuffix>rc</VersionSuffix> -->
     <PackageVersion Condition="'$(APPVEYOR_REPO_TAG)' == 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
 
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
     <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
-    <VersionSuffix Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)-00$(BuildNumber)</VersionSuffix>
+    <VersionSuffix Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
 
     <BranchName Condition=" '$(BranchName)' == '' ">$(APPVEYOR_REPO_BRANCH)</BranchName>
+    <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BranchName)' != '' ">$(VersionSuffix)+$(BranchName)</VersionSuffix>
   </PropertyGroup>
 
   <ItemGroup>