Update to support netstandard1.3.

gsscoder · May 25, 2016 · b19f09b · b19f09b
1 parent 3dfd650
commit b19f09b
Show file tree

Hide file tree

Showing 17 changed files with 372 additions and 391 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,8 +6,8 @@ demo/ReadText.Demo/bin/*
 demo/ReadText.Demo/obj
 tests/CommandLine.Tests/bin/*
 tests/CommandLine.Tests/obj
-tests/CommandLine.dnx.Tests/bin/*
-tests/CommandLine.dnx.Tests/obj
+tests/CommandLine.DotNet.Tests/bin/*
+tests/CommandLine.DotNet.Tests/obj
 tests/CommandLine.Tests.Properties/bin/*
 tests/CommandLine.Tests.Properties/obj
 src/templates/CSharpTemplate/bin/*

diff --git a/CommandLine.sln b/CommandLine.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine", "src\CommandLine\CommandLine.csproj", "{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}"
 EndProject
@@ -24,8 +24,11 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.Tests", "tests\CommandLine.Tests\CommandLine.Tests.csproj", "{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.dotnet", "src\CommandLine.dotnet\CommandLine.dotnet.csproj", "{1E72E75F-888A-400E-865C-44251B8013E1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E1BD3C65-49C3-49E7-BABA-C60980CB3F20} = {E1BD3C65-49C3-49E7-BABA-C60980CB3F20}
+	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CommandLine.dnx.Tests", "tests\CommandLine.dnx.Tests\CommandLine.dnx.Tests.xproj", "{6DB605EC-02BD-4BD9-A63B-9EF77D61DBDA}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CommandLine.DotNet.Tests", "tests\CommandLine.DotNet.Tests\CommandLine.DotNet.Tests.xproj", "{C271A22B-B09A-44DA-A82D-8DF49135FA4C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1E72E75F-888A-400E-865C-44251B8013E1} = {1E72E75F-888A-400E-865C-44251B8013E1}
 	EndProjectSection
@@ -48,10 +51,10 @@ Global
 		{1E72E75F-888A-400E-865C-44251B8013E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E72E75F-888A-400E-865C-44251B8013E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E72E75F-888A-400E-865C-44251B8013E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6DB605EC-02BD-4BD9-A63B-9EF77D61DBDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DB605EC-02BD-4BD9-A63B-9EF77D61DBDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DB605EC-02BD-4BD9-A63B-9EF77D61DBDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6DB605EC-02BD-4BD9-A63B-9EF77D61DBDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C271A22B-B09A-44DA-A82D-8DF49135FA4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C271A22B-B09A-44DA-A82D-8DF49135FA4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C271A22B-B09A-44DA-A82D-8DF49135FA4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C271A22B-B09A-44DA-A82D-8DF49135FA4C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/global.json b/global.json
@@ -1,8 +1,5 @@
 {
   "projects": [
     "wrap"
-  ],
-  "sdk": {
-    "version": "1.0.0-beta8"
-  }
+  ]
 }
diff --git a/nuget/CommandLine.nuspec b/nuget/CommandLine.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>CommandLineParser</id>
-    <version>2.0.275-beta</version>
+    <version>2.1.0-beta</version>
     <title>Command Line Parser Library</title>
     <authors>Giacomo Stelluti Scala</authors>
     <description>Terse syntax C# command line parser for .NET with F# support. The Command Line Parser Library offers to CLR applications a clean and concise API for manipulating command line arguments and related tasks.</description>
@@ -15,20 +15,20 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <tags>command line argument option parser parsing library syntax shell</tags>
     <dependencies>
-      <group targetFramework="dotnet">
-        <dependency id="System.Collections" version="4.0.10" />
-        <dependency id="System.Console" version="4.0.0-beta-23409" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.10" />
-        <dependency id="System.Globalization" version="4.0.10" />
-        <dependency id="System.IO" version="4.0.10" />
-        <dependency id="System.Linq" version="4.0.0" />
-        <dependency id="System.Linq.Expressions" version="4.0.10" />
-        <dependency id="System.Reflection" version="4.0.10" />
-        <dependency id="System.Reflection.Extensions" version="4.0.1-beta-23409" />
-        <dependency id="System.Reflection.TypeExtensions" version="4.0.1-beta-23409" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.0" />
-        <dependency id="System.Runtime" version="4.0.20" />
-        <dependency id="System.Runtime.Extensions" version="4.0.10" />
+      <group targetFramework=".NETStandard1.3">
+        <dependency id="System.Collections" version="4.0.11-rc2-24027" />
+        <dependency id="System.Console" version="4.0.0-rc2-24027" />
+        <dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027" />
+        <dependency id="System.Globalization" version="4.0.11-rc2-24027" />
+        <dependency id="System.IO" version="4.1.0-rc2-24027" />
+        <dependency id="System.Linq" version="4.1.0-rc2-24027" />
+        <dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" />
+        <dependency id="System.Reflection" version="4.1.0-rc2-24027" />
+        <dependency id="System.Reflection.Extensions" version="4.0.1-rc2-24027" />
+        <dependency id="System.Reflection.TypeExtensions" version="4.1.0-rc2-24027" />
+        <dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" />
+        <dependency id="System.Runtime" version="4.1.0-rc2-24027" />
+        <dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24027" />
       </group>
     </dependencies>
   </metadata>
@@ -37,8 +37,8 @@
     <file src="..\build\CommandLine.XML" target="lib\net40\CommandLine.XML" />
     <file src="..\build\CommandLine.dll" target="lib\net45\CommandLine.dll" />
     <file src="..\build\CommandLine.XML" target="lib\net45\CommandLine.XML" />
-    <file src="src\CommandLine.dotnet\bin\portable-dotnet\Release\CommandLine.dll" target="lib\dotnet\CommandLine.dll" />
-    <file src="src\CommandLine.dotnet\bin\portable-dotnet\Release\CommandLine.xml" target="lib\dotnet\CommandLine.xml" />
+    <file src="src\CommandLine.dotnet\bin\portable-dotnet\Release\CommandLine.dll" target="lib\netstandard1.3\CommandLine.dll" />
+    <file src="src\CommandLine.dotnet\bin\portable-dotnet\Release\CommandLine.xml" target="lib\netstandard1.3\CommandLine.xml" />
     <file src=".\readme.txt" target="readme.txt" />
   </files>
 </package>