Update projects and remove beta tag

nbarbettini · Jun 1, 2016 · 77c3a8c · 77c3a8c
1 parent 4138eb9
commit 77c3a8c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/src/Polyglot.Tests.Dnx/Polyglot.Tests.Dnx.xproj b/src/Polyglot.Tests.Dnx/Polyglot.Tests.Dnx.xproj
@@ -4,18 +4,18 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.24720</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>6911fe21-7a5d-4dbf-803f-15f332a167f5</ProjectGuid>
     <RootNamespace>Polyglot.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
diff --git a/src/Polyglot.Tests.Dnx/project.json b/src/Polyglot.Tests.Dnx/project.json
@@ -1,15 +1,16 @@
 {
   "authors": [ "Nate Barbettini" ],
-  "commands": {
-    "test": "xunit.runner.dnx"
-  },
   "dependencies": {
     "dotnet-test-xunit": "1.0.0-rc2-build10025",
     "FluentAssertions": "4.2.2",
     "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
+    "Microsoft.NETCore.App": {
+      "type": "platform",
+      "version": "1.0.0-rc2-3002702"
+    },
     "Polyglot": {
       "target": "project",
-      "version": "1.1.0-beta1"
+      "version": "1.1.0"
     },
     "xunit": "2.1.0"
   },
@@ -23,8 +24,9 @@
     "licenseUrl": "https://github.com/nbarbettini/polyglot-dotnet/blob/master/LICENSE",
     "projectUrl": "https://github.com/nbarbettini/polyglot-dotnet"
   },
+  "testRunner": "xunit",
   "tooling": {
     "defaultNamespace": "Polyglot.Tests.Dnx"
   },
-  "version": "1.0.0"
+  "version": "1.1.0"
 }
diff --git a/src/Polyglot/Polyglot.xproj b/src/Polyglot/Polyglot.xproj
@@ -4,12 +4,12 @@
     <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)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>618997a6-cec6-4d63-9786-cd566ed6aab2</ProjectGuid>
     <RootNamespace>Polyglot</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
@@ -20,5 +20,5 @@
   <ItemGroup>
     <DnxInvisibleFolder Include=".vs\" />
   </ItemGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
diff --git a/src/Polyglot/project.json b/src/Polyglot/project.json
@@ -22,5 +22,5 @@
   "tooling": {
     "defaultNamespace": "Polyglot"
   },
-  "version": "1.1.0-beta1"
+  "version": "1.1.0"
 }