Merge pull request #25 from stormpath/rc2

.NET Core RC2
stormpath · Jun 1, 2016 · 43e05ba · 43e05ba
2 parents 8008bc8 + b73007d
commit 43e05ba
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 66 deletions.
diff --git a/Stormpath.Configuration.sln b/Stormpath.Configuration.sln
@@ -1,14 +1,23 @@
 
 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("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Stormpath.Configuration", "src\Stormpath.Configuration\Stormpath.Configuration.xproj", "{734117C4-70D3-47D1-891A-ECCEB2FC2844}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Stormpath.Configuration.Test", "test\Stormpath.Configuration.Test\Stormpath.Configuration.Test.xproj", "{C818234B-15E4-45B5-AAA0-BB93C95319D3}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Stormpath.Configuration.Abstractions", "src\Stormpath.Configuration.Abstractions\Stormpath.Configuration.Abstractions.xproj", "{C6D48F3C-B35C-44A9-B271-898A8BC448A9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CB9D4701-1FF3-44A0-A9CC-A9AA2E80A0C4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8D9CF7EA-B8A7-4925-8202-1D9230EBE18E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B1B2D9F8-477D-479D-93C0-596B55BFF6F7}"
+	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,4 +40,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{734117C4-70D3-47D1-891A-ECCEB2FC2844} = {CB9D4701-1FF3-44A0-A9CC-A9AA2E80A0C4}
+		{C818234B-15E4-45B5-AAA0-BB93C95319D3} = {8D9CF7EA-B8A7-4925-8202-1D9230EBE18E}
+		{C6D48F3C-B35C-44A9-B271-898A8BC448A9} = {CB9D4701-1FF3-44A0-A9CC-A9AA2E80A0C4}
+	EndGlobalSection
 EndGlobal
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test" ],
   "sdk": {
-    "version": "1.0.0-rc1-update1"
+    "version": "1.0.0-preview1-002702"
   }
 }
diff --git a/src/Stormpath.Configuration.Abstractions/Stormpath.Configuration.Abstractions.xproj b/src/Stormpath.Configuration.Abstractions/Stormpath.Configuration.Abstractions.xproj
@@ -9,9 +9,8 @@
     <ProjectGuid>c6d48f3c-b35c-44a9-b271-898a8bc448a9</ProjectGuid>
     <RootNamespace>Stormpath.Configuration.Abstractions</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/src/Stormpath.Configuration.Abstractions/project.json b/src/Stormpath.Configuration.Abstractions/project.json
@@ -3,32 +3,32 @@
   "copyright": "(c) 2016 Stormpath, Inc.",
   "description": "Abstractions for the Stormpath.Configuration package.",
   "frameworks": {
-    "dnx451": { },
-    "dotnet5.1": {
-      "dependencies": {
-        "System.Collections": "4.0.11-beta-23516",
-        "System.Linq": "4.0.1-beta-23516",
-        "System.Runtime.Extensions": "4.0.11-beta-23516"
+    "net45": {
+      "frameworkAssemblies": {
+        "System.Runtime": {
+          "type": "build",
+          "version": "4.0.0.0"
+        }
       }
     },
-    "net45": { },
-    "netcore50": {
+    "netstandard1.1": {
       "dependencies": {
-        "System.Collections": "4.0.11-beta-23516",
-        "System.Linq": "4.0.1-beta-23516"
+        "NETStandard.Library": "1.5.0-rc2-24027"
       }
     }
   },
-  "licenseUrl": "https://github.com/stormpath/stormpath-dotnet-config/blob/master/LICENSE",
-  "projectUrl": "https://github.com/stormpath/stormpath-dotnet-config/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/stormpath/stormpath-dotnet-config/"
+  "packOptions": {
+    "licenseUrl": "https://github.com/stormpath/stormpath-dotnet-config/blob/master/LICENSE",
+    "projectUrl": "https://github.com/stormpath/stormpath-dotnet-config/",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/stormpath/stormpath-dotnet-config/"
+    },
+    "tags": [ "stormpath" ]
   },
-  "tags": [ "stormpath" ],
   "tooling": {
     "defaultNamespace": "Stormpath.Configuration.Abstractions"
   },
-  "version": "5.0.0",
-  "xmlDoc":  true
+  "version": "5.1.0-beta2",
+  "xmlDoc": true
 }
diff --git a/src/Stormpath.Configuration/Stormpath.Configuration.xproj b/src/Stormpath.Configuration/Stormpath.Configuration.xproj
@@ -9,9 +9,8 @@
     <ProjectGuid>734117c4-70d3-47d1-891a-ecceb2fc2844</ProjectGuid>
     <RootNamespace>Stormpath.Configuration</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/src/Stormpath.Configuration/project.json b/src/Stormpath.Configuration/project.json
@@ -2,42 +2,33 @@
   "authors": [ "Nate Barbettini" ],
   "copyright": "(c) 2016 Stormpath, Inc.",
   "dependencies": {
-    "FlexibleConfiguration": "1.0.2",
-    "Stormpath.Configuration.Abstractions": "5.0.0"
+    "FlexibleConfiguration": "1.1.0-beta2",
+    "Stormpath.Configuration.Abstractions": {
+      "target": "project",
+      "version": "5.1.0-beta2"
+    }
   },
   "description": "Load Stormpath configuration from various sources.",
   "frameworks": {
-    "dnx451": {
-      "dependencies": {
-        "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final"
-      }
-    },
-    "dotnet5.4": {
-      "dependencies": {
-        "Microsoft.CSharp": "4.0.1-beta-23516",
-        "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final",
-        "System.Collections": "4.0.11-beta-23516",
-        "System.Linq": "4.0.1-beta-23516",
-        "System.Runtime": "4.0.21-beta-23516",
-        "System.Threading": "4.0.11-beta-23516"
-      }
-    },
     "net45": { },
-    "netcore50": {
+    "netstandard1.3": {
       "dependencies": {
-        "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final"
-      }
+        "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
+        "NETStandard.Library": "1.5.0-rc2-24027"
+      },
+      "imports": "dotnet"
     }
   },
-  "licenseUrl": "https://github.com/stormpath/stormpath-dotnet-config/blob/master/LICENSE",
-  "projectUrl": "https://github.com/stormpath/stormpath-dotnet-config/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/stormpath/stormpath-dotnet-config/"
+  "packOptions": {
+    "licenseUrl": "https://github.com/stormpath/stormpath-dotnet-config/blob/master/LICENSE",
+    "projectUrl": "https://github.com/stormpath/stormpath-dotnet-config/",
+    "repository": {
+      "url": "https://github.com/stormpath/stormpath-dotnet-config/"
+    },
+    "tags": [ "stormpath" ]
   },
-  "tags": [ "stormpath" ],
   "tooling": {
     "defaultNamespace": "Stormpath.Configuration"
   },
-  "version": "5.0.0"
+  "version": "5.1.0-beta2"
 }
diff --git a/test/Stormpath.Configuration.Test/Stormpath.Configuration.Test.xproj b/test/Stormpath.Configuration.Test/Stormpath.Configuration.Test.xproj
@@ -9,7 +9,7 @@
     <ProjectGuid>c818234b-15e4-45b5-aaa0-bb93c95319d3</ProjectGuid>
     <RootNamespace>Stormpath.Configuration.Test</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

diff --git a/test/Stormpath.Configuration.Test/project.json b/test/Stormpath.Configuration.Test/project.json
@@ -1,28 +1,36 @@
 {
   "authors": [ "Nate Barbettini" ],
-  "commands": {
-    "test": "xunit.runner.dnx"
-  },
   "copyright": "(c) 2016 Stormpath, Inc.",
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-rc2-build10015",
     "FluentAssertions": "4.2.1",
-    "Stormpath.Configuration": "5.0.0",
-    "xunit": "2.1.0",
-    "xunit.runner.dnx": "2.1.0-rc1-build204"
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
+    "Microsoft.NETCore.App": {
+      "type": "platform",
+      "version": "1.0.0-rc2-3002702"
+    },
+    "Stormpath.Configuration": {
+      "version": "5.1.0-beta2",
+      "target": "project"
+    },
+    "xunit": "2.1.0"
   },
   "description": "Tests for Stormpath.Configuration",
   "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "netcoreapp1.0": {
+      "imports": [ "dotnet", "portable-net45+win8" ]
+    }
   },
-  "licenseUrl": "https://github.com/stormpath/stormpath-dotnet-config/blob/master/LICENSE",
-  "projectUrl": "https://github.com/stormpath/stormpath-dotnet-config/",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/stormpath/stormpath-dotnet-config/"
+  "packOptions": {
+    "licenseUrl": "https://github.com/stormpath/stormpath-dotnet-config/blob/master/LICENSE",
+    "projectUrl": "https://github.com/stormpath/stormpath-dotnet-config/",
+    "repository": {
+      "url": "https://github.com/stormpath/stormpath-dotnet-config/"
+    }
   },
+  "testRunner": "xunit",
   "tooling": {
     "defaultNamespace": "Stormpath.Configuration.Test"
   },
-  "version": "5.0.0"
+  "version": "5.1.0-beta2"
 }