Upgraded to .NET Core RC2.

scientistproject · May 26, 2016 · 4f5c2c8 · 4f5c2c8
1 parent 43e27ee
commit 4f5c2c8
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 52 deletions.
diff --git a/global.json b/global.json
@@ -1,6 +1,3 @@
 {
-  "projects": [ "src", "test" ],
-  "sdk": {
-    "version": "1.0.0-rc1-update1"
-  }
+  "projects": [ "src", "test" ]
 }
diff --git a/src/Scientist/Scientist.nuget.targets b/src/Scientist/Scientist.nuget.targets
diff --git a/src/Scientist/Scientist.xproj b/src/Scientist/Scientist.xproj
@@ -4,17 +4,20 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>af3e98cd-da8c-43b2-8217-76b6ae8bca20</ProjectGuid>
     <RootNamespace>Scientist</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties __JSONSchema="http://json.schemastore.org/project-1.0.0-rc2" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
diff --git a/src/Scientist/project.json b/src/Scientist/project.json
@@ -1,28 +1,32 @@
 {
-  "version": "1.0.0-alpha5",
+  "version": "1.0.0-alpha6",
   "description": "scientist",
   "authors": [ "Github" ],
-  "tags": [ "scientist", "refactoring" ],
-  "summary": "A .NET library for carefully refactoring critical paths. It's a port of GitHub's Ruby Scientist library.",
-  "projectUrl": "http://github.com/haacked/scientist.net",
-  "licenseUrl": "https://raw.githubusercontent.com/haacked/scientist/master/LICENSE",
-  "releaseNotes": "",
-  "dependencies": {
-    "Microsoft.CSharp": "4.0.1-beta-23516",
-    "System.Collections": "4.0.11-beta-23516",
-    "System.Collections.Concurrent": "4.0.11-beta-23516",
-    "System.Linq": "4.0.1-beta-23516",
-    "System.Runtime": "4.0.21-beta-23516",
-    "System.Runtime.Extensions": "4.0.11-beta-23516",
-    "System.Runtime.InteropServices": "4.0.21-beta-23516",
-    "System.Threading": "4.0.11-beta-23516"
-
-  },
   "frameworks": {
-    "dotnet5.2": { },
-    "dnx451": { }
+    "netstandard1.5": {
+      "dependencies": {
+        "Microsoft.CSharp": "4.0.1-rc2-24027",
+        "System.Collections": "4.0.11-rc2-24027",
+        "System.Collections.Concurrent": "4.0.12-rc2-24027",
+        "System.Linq": "4.1.0-rc2-24027",
+        "System.Runtime": "4.1.0-rc2-24027",
+        "System.Runtime.Extensions": "4.1.0-rc2-24027",
+        "System.Runtime.InteropServices": "4.1.0-rc2-24027",
+        "System.Threading": "4.0.11-rc2-24027"
+      }
+    },
+    "net451": { }
   },
-  "packInclude": {
-    "/": [ "../../LICENSE.txt", "../../README.md", "../../ReleaseNotes.md" ]
+  "packOptions": {
+    "files": [
+      "../../LICENSE.txt",
+      "../../README.md",
+      "../../ReleaseNotes.md"
+    ],
+    "licenseUrl": "https://raw.githubusercontent.com/haacked/scientist/master/LICENSE",
+    "projectUrl": "http://github.com/haacked/scientist.net",
+    "releaseNotes": "",
+    "summary": "A .NET library for carefully refactoring critical paths. It's a port of GitHub's Ruby Scientist library.",
+    "tags": [ "scientist", "refactoring" ]
   }
 }
diff --git a/test/Scientist.Test/ScientistTests.cs b/test/Scientist.Test/ScientistTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Runtime.Remoting.Messaging;
 using System.Threading.Tasks;
 using GitHub;
 using GitHub.Internals;

diff --git a/test/Scientist.Test/project.json b/test/Scientist.Test/project.json
@@ -1,24 +1,18 @@
 {
-  "version": "1.0.0-*",
-  "description": "scientist.test",
-  "authors": [ "Github" ],
-  "tags": [ "" ],
-  "projectUrl": "",
-  "licenseUrl": "",
+  "buildOptions": {
+    "copyToOutput": {
+      "include": [ "xunit.runner.json" ]
+    }
+  },
   "dependencies": {
-    "Microsoft.CSharp": "4.0.1-beta-23516",
-    "System.Collections": "4.0.11-beta-23516",
-    "System.Collections.Concurrent": "4.0.11-beta-23516",
-    "System.Linq": "4.0.1-beta-23516",
-    "xunit": "2.1.0",
-    "xunit.runner.dnx": "2.1.0-rc1-build204",
+    "dotnet-test-xunit": "1.0.0-rc3-build10026",
     "NSubstitute": "1.9.2",
-    "Scientist": ""
+    "Scientist": "*",
+    "xunit": "2.1.0"
   },
   "frameworks": {
-    "dnx451": { }
+    "net451": { }
   },
-  "commands": {
-    "test": "xunit.runner.dnx"
-  }
+  "testRunner": "xunit",
+  "version": "1.0.0-*"
 }