Merge pull request #386 from commandlineparser/ViktorHofer-netstandard20

merge Viktor hofer netstandard20

Author: ericnewton76

Diff for: .paket/Paket.Restore.targets

@@ -1,26 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2042
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine", "src\CommandLine\CommandLine.csproj", "{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Welcome", ".Welcome", "{D9C1F005-94A7-4A2A-81F3-9C053D5A6AEC}"
-	ProjectSection(SolutionItems) = preProject
-		License.md = License.md
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{751E6303-1623-4418-B298-4FF97DA5C86E}"
-	ProjectSection(SolutionItems) = preProject
-		demo\fsharp-demo.fsx = demo\fsharp-demo.fsx
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A6C99AE7-2FE1-4393-9281-7BFCF46A6F53}"
-	ProjectSection(SolutionItems) = preProject
-		build.fsx = build.fsx
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.Tests", "tests\CommandLine.Tests\CommandLine.Tests.csproj", "{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}"
 EndProject
 Global
@@ -41,6 +25,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5B5A476C-82FB-49FB-B592-5224D9005186}
+	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = src\CommandLine\CommandLine.csproj
 	EndGlobalSection

Diff for: .paket/paket.bootstrapper.exe

@@ -98,7 +98,7 @@ class Options
   public bool Verbose { get; set; }
 
   [Option("stdin",
-	Default = false
+	Default = false,
 	HelpText = "Read from stdin")]
   public bool stdin { get; set; }
 

Diff for: CommandLine.nuspec

@@ -1,14 +1,10 @@
-#version should be changed with any pull requests
-version: 2.2.{build}
+#version should be only changed with RELEASE eminent, see RELEASE.md
+version: 2.3.{build}
 
 clone_depth: 1
 pull_requests:
   do_not_increment_build_number: true
 
-#cache:
-#- packages -> paket.dependencies
-#- paket-files > paket.dependencies
-
 init:
   - ps: |
       git config --global core.autocrlf input
@@ -18,49 +14,23 @@ init:
         if($ver.StartsWith("v") -eq $true) { $ver = $ver.Substring(1) }
         Update-AppveyorBuild -Version $ver
       }
-      elseif([System.String]::IsNullOrEmpty($env:APPVEYOR_PULL_REQUEST_NUMBER) -eq $true) {
-        $ver = $env:APPVEYOR_BUILD_VERSION
-        $commit = $env:APPVEYOR_REPO_COMMIT.substring(0,7)
-        Update-AppveyorBuild -Version "$ver-$commit"
-      }
-
-#version patching
-assembly_info:
-  file: src\SharedAssemblyInfo.cs
-  patch: true
-  assembly_version: '{version}'
-  assembly_file_version: '{version}'
-  assembly_informational_version: $(APPVEYOR_BUILD_VERSION)
-dotnet_csproj:
-  patch: true
-  file: '**\*.csproj'
-  version: '{version}'
-  package_version: '{version}'
-  assembly_version: '{version}'
-  file_version: '{version}'
-  informational_version: '{version}'
-
 
 environment:
   matrix:
     - BUILD_TARGET: base
-      NUSPEC_FILE: CommandLine
     - BUILD_TARGET: fsharp
-      NUSPEC_FILE: CommandLine.FSharp
 
 build_script:
-  - cmd: build.cmd %BUILD_TARGET%
+- cmd: dotnet build src/CommandLine/ -c Release --version-suffix %APPVEYOR_BUILD_VERSION% /p:BuildTarget=%BUILD_TARGET%
 
-after_build:
-- ps: |
-    powershell get-childitem Release\* -include *.dll | foreach-object { "{0}`t{1}" -f $_.Path, [System.Diagnostics.FileVersionInfo]::GetVersionInfo($_).FileVersion }
-    
-    .\build-nuget-pack.cmd $env:BUILD_TARGET $env:NUSPEC_FILE
+test_script: 
+- cmd: dotnet test tests/CommandLine.Tests/ /p:BuildTarget=%BUILD_TARGET%
 
-test: auto
+after_test:
+- cmd: dotnet pack src/CommandLine/ -c Release --version-suffix %APPVEYOR_BUILD_VERSION% /p:BuildTarget=%BUILD_TARGET%
 
 artifacts:
-- path: 'Release/**/*.nupkg'
+- path: 'src/CommandLine/bin/Release/*.nupkg'
   name: NugetPackages
 
 on_failure:
@@ -74,6 +44,5 @@ deploy:
     secure: +Zxb8M5W+UJV1yd9n8seu3PvH/hGNPEmgriGBnsSmtxjKPQAJ4+iL7tKAmfPHAuG
   artifact: 'NuGetPackages'
   on:
-    branch: /master|v\d+\.\d+\.\d+[.*]/
     APPVEYOR_REPO_TAG: true