From 83c93c79e6f84a0a19bc9552a12dd3d7cafeca8f Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Wed, 2 Mar 2016 18:54:50 -0800
Subject: [PATCH] Remove project name from output path -
 aspnet/Coherence-Signed#187 - remove `<RootNamespace>` settings but maintain
 other unique aspects e.g. `<DnxInvisibleContent ... />` - in a few cases,
 standardize on VS version `14.0` and not something more specific

---
 samples/IISSample/IISSample.xproj                         | 3 +--
 .../Microsoft.AspNetCore.IISPlatformHandler.xproj         | 5 ++---
 src/dotnet-publish-iis/dotnet-publish-iis.xproj           | 8 +++-----
 ...ft.AspNetCore.IISPlatformHandler.FunctionalTests.xproj | 5 ++---
 .../Microsoft.AspNetCore.IISPlatformHandler.Tests.xproj   | 5 ++---
 test/TestSites/TestSites.xproj                            | 3 +--
 .../dotnet-publish-iis.Tests.xproj                        | 7 +++----
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/samples/IISSample/IISSample.xproj b/samples/IISSample/IISSample.xproj
index 4b3ec10e26..10fe198590 100644
--- a/samples/IISSample/IISSample.xproj
+++ b/samples/IISSample/IISSample.xproj
@@ -7,9 +7,8 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>e4e2bdc4-a9c6-4ae9-b429-032ec83ede64</ProjectGuid>
-    <RootNamespace>IISSample</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/Microsoft.AspNetCore.IISPlatformHandler.xproj b/src/Microsoft.AspNetCore.IISPlatformHandler/Microsoft.AspNetCore.IISPlatformHandler.xproj
index 6ac1949334..92a9bdf025 100644
--- a/src/Microsoft.AspNetCore.IISPlatformHandler/Microsoft.AspNetCore.IISPlatformHandler.xproj
+++ b/src/Microsoft.AspNetCore.IISPlatformHandler/Microsoft.AspNetCore.IISPlatformHandler.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -7,9 +7,8 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>abe53415-83ce-4af0-af67-e52160c7862b</ProjectGuid>
-    <RootNamespace>Microsoft.AspNetCore.IISPlatformHandler</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
diff --git a/src/dotnet-publish-iis/dotnet-publish-iis.xproj b/src/dotnet-publish-iis/dotnet-publish-iis.xproj
index 4938d25248..02984f1884 100644
--- a/src/dotnet-publish-iis/dotnet-publish-iis.xproj
+++ b/src/dotnet-publish-iis/dotnet-publish-iis.xproj
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0.24720" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.24720</VisualStudioVersion>
+    <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>e492aef2-42c1-4399-b718-a6934ebb36ab</ProjectGuid>
-    <RootNamespace>dotnet-publish-iis</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests.xproj b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests.xproj
index c56a5b59ec..4a8963f8cc 100644
--- a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests.xproj
+++ b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -7,9 +7,8 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>a83a33d1-3d29-403c-9750-5811ac7b4025</ProjectGuid>
-    <RootNamespace>Microsoft.AspNetCore.PlatformHandler.FunctionalTests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/Microsoft.AspNetCore.IISPlatformHandler.Tests.xproj b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/Microsoft.AspNetCore.IISPlatformHandler.Tests.xproj
index 5f56bca6ba..ec688ba4cc 100644
--- a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/Microsoft.AspNetCore.IISPlatformHandler.Tests.xproj
+++ b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/Microsoft.AspNetCore.IISPlatformHandler.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -7,9 +7,8 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>fbbbe015-1ce3-454b-9647-23f8073fb7ab</ProjectGuid>
-    <RootNamespace>Microsoft.AspNetCore.PipelineHandler.Tests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
diff --git a/test/TestSites/TestSites.xproj b/test/TestSites/TestSites.xproj
index db5463e044..d61af61fcf 100644
--- a/test/TestSites/TestSites.xproj
+++ b/test/TestSites/TestSites.xproj
@@ -7,9 +7,8 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>e27453ad-9ca0-49a2-94fa-96337d77677d</ProjectGuid>
-    <RootNamespace>Sites</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
diff --git a/test/dotnet-publish-iis.Tests/dotnet-publish-iis.Tests.xproj b/test/dotnet-publish-iis.Tests/dotnet-publish-iis.Tests.xproj
index 2d98be76ad..e7542f3944 100644
--- a/test/dotnet-publish-iis.Tests/dotnet-publish-iis.Tests.xproj
+++ b/test/dotnet-publish-iis.Tests/dotnet-publish-iis.Tests.xproj
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0.24720" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.24720</VisualStudioVersion>
+    <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>cfb3af72-0af6-44cb-8815-6e4052c7b5a0</ProjectGuid>
-    <RootNamespace>dotnet-publish-iis.Tests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>