Corrected incorrect targets / props in xproj files. They were dnx and…

… should have been changed to dotnet.
mperdeck · Jun 19, 2016 · 589b874 · 589b874
1 parent 783175f
commit 589b874
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 22 deletions.
diff --git a/src/JSNLog.TestSite/JSNLog.TestSite.xproj b/src/JSNLog.TestSite/JSNLog.TestSite.xproj
@@ -4,12 +4,13 @@
     <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>771b5ac4-efd1-4668-b1a1-6cad753477c2</ProjectGuid>
     <RootNamespace>JSNLog.TestSite</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
@@ -19,5 +20,5 @@
     <DnxInvisibleContent Include=".bowerrc" />
     <DnxInvisibleContent Include="package.json" />
   </ItemGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
diff --git a/src/JSNLog.Tests/JSNLog.Tests.xproj b/src/JSNLog.Tests/JSNLog.Tests.xproj
@@ -4,18 +4,19 @@
     <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>650f9c8c-3496-416b-9e73-29b74b074a45</ProjectGuid>
     <RootNamespace>JSNLog.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </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/JSNLog.Tests/project.json b/src/JSNLog.Tests/project.json
@@ -7,7 +7,7 @@
   ],
   "frameworks": {
     "net452": {
-      "dependencies": { }
+      "dependencies": {}
     }
   },
   "dependencies": {
@@ -16,13 +16,11 @@
     "dotnet-test-xunit": "1.0.0-rc2-build10025",
     "JSNLog": "2.17.4"
   },
-  "tools": {
-
-  },
+  "tools": {},
   "buildOptions": {
-    "preserveCompilationContext": true,   
+    "preserveCompilationContext": true,
     "copyToOutput": {
-      "include": [ ]
+      "include": []
     }
   },
   "packOptions": {
@@ -33,6 +31,6 @@
     "projectUrl": ""
   },
   "publishOptions": {
-    "include": [ ]
+    "include": []
   }
 }
diff --git a/src/JSNLog/JSNLog.xproj b/src/JSNLog/JSNLog.xproj
@@ -4,18 +4,19 @@
     <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>dc2f1e35-c7cc-4054-8671-424e801a104e</ProjectGuid>
     <RootNamespace>JSNLog</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
diff --git a/src/JSNLog/project.json b/src/JSNLog/project.json
@@ -2,7 +2,12 @@
   "version": "2.17.4",
   "frameworks": {
     "net452": {
-      "buildOptions": { "define": [ "NET452", "SUPPORTSXML" ] },   
+      "buildOptions": {
+        "define": [
+          "NET452",
+          "SUPPORTSXML"
+        ]
+      },
       "dependencies": {
         "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-rc2-final",
         "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
@@ -13,7 +18,12 @@
       }
     },
     "net40": {
-      "buildOptions": { "define": [ "NET40", "SUPPORTSXML" ] },   
+      "buildOptions": {
+        "define": [
+          "NET40",
+          "SUPPORTSXML"
+        ]
+      },
       "dependencies": {
         "Common.Logging": "3.0.0",
         "Microsoft.Owin": "2.1.0",
@@ -26,7 +36,12 @@
       }
     },
     "netstandard1.5": {
-      "buildOptions": { "define": [ "NETSTANDARD", "NETSTANDARD1_5" ] },      
+      "buildOptions": {
+        "define": [
+          "NETSTANDARD",
+          "NETSTANDARD1_5"
+        ]
+      },
       "imports": [
         "dnxcore50",
         "portable-net45+win8"
@@ -47,11 +62,11 @@
   "buildOptions": {
     "preserveCompilationContext": true,
     "copyToOutput": {
-      "include": [ ]
+      "include": []
     }
   },
   "publishOptions": {
-    "include": [ ]
+    "include": []
   },
-  "tools": { }
+  "tools": {}
 }