From 4a3d9b09558afc7c403b251d36dc115a6d1d2aab Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 12 Sep 2017 10:58:27 -0700
Subject: [PATCH] Use Directory.Build.props/targets

---
 appveyor.yml => .appveyor.yml                       | 0
 Directory.Build.props                               | 3 +++
 Directory.Build.targets                             | 2 ++
 MusicStore.sln                                      | 8 ++++++--
 samples/MusicStore/MusicStore.csproj                | 2 --
 test/Directory.Build.props                          | 9 +++++++++
 test/MusicStore.E2ETests/MusicStore.E2ETests.csproj | 6 ------
 test/MusicStore.Test/MusicStore.Test.csproj         | 5 -----
 version.xml                                         | 6 ------
 9 files changed, 20 insertions(+), 21 deletions(-)
 rename appveyor.yml => .appveyor.yml (100%)
 create mode 100644 Directory.Build.props
 create mode 100644 Directory.Build.targets
 create mode 100644 test/Directory.Build.props
 delete mode 100644 version.xml

diff --git a/appveyor.yml b/.appveyor.yml
similarity index 100%
rename from appveyor.yml
rename to .appveyor.yml
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000000..dde59af571
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+    <Import Project="build\dependencies.props" />
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000000..f75adf7e4d
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/MusicStore.sln b/MusicStore.sln
index 66539db055..d6b14c6abe 100644
--- a/MusicStore.sln
+++ b/MusicStore.sln
@@ -1,9 +1,11 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
+VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7D749BDA-4638-4517-B66A-D40DEDEEB141}"
 	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
@@ -19,7 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore.E2ETests", "test
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{88A30728-49E5-46C5-9CEC-9D8FD346A043}"
 	ProjectSection(SolutionItems) = preProject
-		build\dependencies.props = build\dependencies.props
 		build\repo.targets = build\repo.targets
 	EndProjectSection
 EndProject
@@ -78,4 +79,7 @@ Global
 		{CA663205-77DE-4E55-B300-85594181B5A9} = {363D2681-31A6-48C9-90BB-9ACFF4A41F06}
 		{72A5F455-121F-4954-BF28-D712C6BE88EA} = {363D2681-31A6-48C9-90BB-9ACFF4A41F06}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4AC7A44E-260A-4E70-88A7-77A0027E12A5}
+	EndGlobalSection
 EndGlobal
diff --git a/samples/MusicStore/MusicStore.csproj b/samples/MusicStore/MusicStore.csproj
index 3ec7a66117..03aa7afefe 100644
--- a/samples/MusicStore/MusicStore.csproj
+++ b/samples/MusicStore/MusicStore.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\build\dependencies.props" />
-
   <PropertyGroup>
     <Description>Music store application on ASP.NET Core</Description>
     <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
new file mode 100644
index 0000000000..d962c6d97f
--- /dev/null
+++ b/test/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
index 5b5f46ac60..ce0e7290fd 100644
--- a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
+++ b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\build\dependencies.props" />
-
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <UserSecretsId>MusicStore.E2ETests</UserSecretsId>
@@ -29,11 +27,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="System.Data.SqlClient" Version="$(CoreFxVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/MusicStore.Test/MusicStore.Test.csproj b/test/MusicStore.Test/MusicStore.Test.csproj
index 33782fc445..7220360fa1 100644
--- a/test/MusicStore.Test/MusicStore.Test.csproj
+++ b/test/MusicStore.Test/MusicStore.Test.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\build\dependencies.props" />
-
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
@@ -13,9 +11,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/version.xml b/version.xml
deleted file mode 100644
index ebc4d03121..0000000000
--- a/version.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This file may be overwritten by automation. -->
-<Project>
-  <PropertyGroup>
-    <KoreBuildChannel>dev</KoreBuildChannel>
-  </PropertyGroup>
-</Project>