From 09a7250ccda02c499a24ecbacd8ebdb6f6b0a05d Mon Sep 17 00:00:00 2001
From: Praburaj <praburaj.t@microsoft.com>
Date: Wed, 1 Apr 2015 13:25:13 -0700
Subject: [PATCH 1/4] Fixing the logging package names in the unit test
 projects.

---
 test/MusicStore.Spa.Test/project.json | 2 +-
 test/MusicStore.Test/project.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/MusicStore.Spa.Test/project.json b/test/MusicStore.Spa.Test/project.json
index cb87e77..46cb1d9 100644
--- a/test/MusicStore.Spa.Test/project.json
+++ b/test/MusicStore.Spa.Test/project.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "MusicStore.Spa": "",
     "Microsoft.AspNet.Mvc" : "6.0.0-*",
-    "Microsoft.AspNet.Testing.Logging" :  "1.0.0-*",
+    "Microsoft.Framework.Logging.Testing" :  "1.0.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "commands": {
diff --git a/test/MusicStore.Test/project.json b/test/MusicStore.Test/project.json
index 9c27a8e..302312f 100644
--- a/test/MusicStore.Test/project.json
+++ b/test/MusicStore.Test/project.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "MusicStore": "",
     "Microsoft.AspNet.Mvc" : "6.0.0-*",
-    "Microsoft.AspNet.Testing.Logging" :  "1.0.0-*",
+    "Microsoft.Framework.Logging.Testing" :  "1.0.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "commands": {

From 3b8d53e0101a0688baef2b73f60eb5a3a848c295 Mon Sep 17 00:00:00 2001
From: Praburaj <praburaj.t@microsoft.com>
Date: Wed, 1 Apr 2015 13:59:57 -0700
Subject: [PATCH 2/4] Fixing namespaces.

My VS build succeeds even without this change. On CI it seems to fail.
---
 test/MusicStore.Test/CheckoutControllerTest.cs     | 2 +-
 test/MusicStore.Test/ShoppingCartControllerTest.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/MusicStore.Test/CheckoutControllerTest.cs b/test/MusicStore.Test/CheckoutControllerTest.cs
index 43ec621..aab537c 100644
--- a/test/MusicStore.Test/CheckoutControllerTest.cs
+++ b/test/MusicStore.Test/CheckoutControllerTest.cs
@@ -9,10 +9,10 @@ using Microsoft.AspNet.Http.Core;
 using Microsoft.AspNet.Http.Core.Collections;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Session;
-using Microsoft.AspNet.Testing.Logging;
 using Microsoft.Framework.Caching.Distributed;
 using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.Logging.Testing;
 using MusicStore.Models;
 using Xunit;
 
diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs
index 9d27d7b..99e9f80 100644
--- a/test/MusicStore.Test/ShoppingCartControllerTest.cs
+++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs
@@ -7,10 +7,10 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Core;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Session;
-using Microsoft.AspNet.Testing.Logging;
 using Microsoft.Framework.Caching.Distributed;
 using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.Logging.Testing;
 using MusicStore.Models;
 using MusicStore.ViewModels;
 using Xunit;

From df29aaaafd4a92fd5daaa6999f12c0ccc70dbbca Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Thu, 2 Apr 2015 13:49:27 -0700
Subject: [PATCH 3/4] Update .xproj files for Microsoft.Web.AspNet.* ->
 Microsoft.DNX.* rename

---
 src/MusicStore.Spa/MusicStore.Spa.xproj            | 4 ++--
 src/MusicStore/MusicStore.xproj                    | 9 ++-------
 test/E2ETests/E2ETests.xproj                       | 9 ++-------
 test/MusicStore.Spa.Test/MusicStore.Spa.Test.xproj | 7 ++-----
 test/MusicStore.Test/MusicStore.Test.xproj         | 9 ++++-----
 5 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/MusicStore.Spa/MusicStore.Spa.xproj b/src/MusicStore.Spa/MusicStore.Spa.xproj
index 36346fd..8a12e79 100644
--- a/src/MusicStore.Spa/MusicStore.Spa.xproj
+++ b/src/MusicStore.Spa/MusicStore.Spa.xproj
@@ -4,7 +4,7 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>93891170-a8d5-46fd-a291-40f90cf258c2</ProjectGuid>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
@@ -14,5 +14,5 @@
     <SchemaVersion>2.0</SchemaVersion>
     <DevelopmentServerPort>1575</DevelopmentServerPort>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/MusicStore/MusicStore.xproj b/src/MusicStore/MusicStore.xproj
index 695d969..dca5217 100644
--- a/src/MusicStore/MusicStore.xproj
+++ b/src/MusicStore/MusicStore.xproj
@@ -4,7 +4,7 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>3cfbed5d-2ed8-49db-96fb-bdaa748dc5a0</ProjectGuid>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
@@ -14,10 +14,5 @@
     <SchemaVersion>2.0</SchemaVersion>
     <DevelopmentServerPort>5001</DevelopmentServerPort>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties project_1json__JSONSchema="http://www.asp.net/media/4878834/project.json" />
-    </VisualStudio>
-  </ProjectExtensions>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/E2ETests/E2ETests.xproj b/test/E2ETests/E2ETests.xproj
index 9c0d9e9..10cc902 100644
--- a/test/E2ETests/E2ETests.xproj
+++ b/test/E2ETests/E2ETests.xproj
@@ -4,7 +4,7 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>a319acce-060b-4385-9534-9f2202f6180e</ProjectGuid>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
@@ -13,10 +13,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties project_1json__JSONSchema="http://www.asp.net/media/4878834/project.json" />
-    </VisualStudio>
-  </ProjectExtensions>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/MusicStore.Spa.Test/MusicStore.Spa.Test.xproj b/test/MusicStore.Spa.Test/MusicStore.Spa.Test.xproj
index bdc0cfd..6e93c77 100644
--- a/test/MusicStore.Spa.Test/MusicStore.Spa.Test.xproj
+++ b/test/MusicStore.Spa.Test/MusicStore.Spa.Test.xproj
@@ -4,17 +4,14 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>9d3326c4-1f12-4526-9f25-712a1463b3fa</ProjectGuid>
-    <RootNamespace>MusicStore.Spa.Test</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)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/MusicStore.Test/MusicStore.Test.xproj b/test/MusicStore.Test/MusicStore.Test.xproj
index ec10069..2a2111d 100644
--- a/test/MusicStore.Test/MusicStore.Test.xproj
+++ b/test/MusicStore.Test/MusicStore.Test.xproj
@@ -4,15 +4,14 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>ca663205-77de-4e55-b300-85594181b5a9</ProjectGuid>
-    <RootNamespace>MusicStore</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file

From 18153af36770fd69b148b3131d5a675862b11d39 Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Thu, 2 Apr 2015 23:01:54 -0700
Subject: [PATCH 4/4] Add a few more `<Service/>` items

---
 test/E2ETests/E2ETests.xproj                       | 3 +++
 test/MusicStore.Spa.Test/MusicStore.Spa.Test.xproj | 3 +++
 test/MusicStore.Test/MusicStore.Test.xproj         | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/test/E2ETests/E2ETests.xproj b/test/E2ETests/E2ETests.xproj
index 10cc902..9474f8e 100644
--- a/test/E2ETests/E2ETests.xproj
+++ b/test/E2ETests/E2ETests.xproj
@@ -13,5 +13,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/MusicStore.Spa.Test/MusicStore.Spa.Test.xproj b/test/MusicStore.Spa.Test/MusicStore.Spa.Test.xproj
index 6e93c77..d919ba4 100644
--- a/test/MusicStore.Spa.Test/MusicStore.Spa.Test.xproj
+++ b/test/MusicStore.Spa.Test/MusicStore.Spa.Test.xproj
@@ -13,5 +13,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/MusicStore.Test/MusicStore.Test.xproj b/test/MusicStore.Test/MusicStore.Test.xproj
index 2a2111d..d5272ac 100644
--- a/test/MusicStore.Test/MusicStore.Test.xproj
+++ b/test/MusicStore.Test/MusicStore.Test.xproj
@@ -13,5 +13,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file