From 1577a0b86f13990ce7dfed4914ac5001960e9ad0 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Fri, 17 Jan 2020 07:48:20 -0800
Subject: [PATCH] Clean up solution (#912)

- Use global.json to control what version of .NET SDK is used for building so local builds also use the version used for pipeline builds
- Add some missing items to the sln so they are viewable through VS
- Delete extra project file
---
 azure-pipelines/build.yml                          |  4 ++--
 global.json                                        |  8 ++++++++
 sqltoolsservice.sln                                | 14 ++++++++++++--
 .../Microsoft.SqlTools.ServiceLayer.csproj]        |  0
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 global.json
 delete mode 100644 src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj]

diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
index 334e87d1..54c96d5f 100644
--- a/azure-pipelines/build.yml
+++ b/azure-pipelines/build.yml
@@ -20,9 +20,9 @@ steps:
     ArtifactName: source
 
 - task: UseDotNet@2
-  displayName: 'Use .NET Core sdk 2.2.108'
+  displayName: 'Use defined .NET Core sdk'
   inputs:
-    version: 2.2.108
+    useGlobalJson: true
 
 - task: DotNetCoreCLI@1
   displayName: 'dotnet restore src/Microsoft.SqlTools.Credentials'
diff --git a/global.json b/global.json
new file mode 100644
index 00000000..3010f881
--- /dev/null
+++ b/global.json
@@ -0,0 +1,8 @@
+{
+    "sdk": {
+        "version": "2.2.108"
+    },
+    "msbuild-sdks": {
+        "Microsoft.Build.Traversal": "2.0.2"
+    }
+}
\ No newline at end of file
diff --git a/sqltoolsservice.sln b/sqltoolsservice.sln
index db9e7fb1..0e8bbbd8 100644
--- a/sqltoolsservice.sln
+++ b/sqltoolsservice.sln
@@ -1,8 +1,11 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.16
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29409.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2BBD7364-054F-4693-97CD-1C395E3E84A9}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{AB9CA2B8-6F70-431C-8A1D-67479D8A7BE4}"
 EndProject
@@ -13,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.travis.yml = .travis.yml
 		appveyor.yml = appveyor.yml
 		BUILD.md = BUILD.md
+		Directory.Build.props = Directory.Build.props
 		global.json = global.json
 		license.txt = license.txt
 		nuget.config = nuget.config
@@ -97,6 +101,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SqlTools.ManagedB
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SqlTools.Test.CompletionExtension", "test\Microsoft.SqlTools.Test.CompletionExtension\Microsoft.SqlTools.Test.CompletionExtension.csproj", "{0EC2B30C-0652-49AE-9594-85B3C3E9CA21}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-pipelines", "azure-pipelines", "{48D5C134-4091-438D-9D35-6EB8CF0D1DCC}"
+	ProjectSection(SolutionItems) = preProject
+		azure-pipelines\build.yml = azure-pipelines\build.yml
+		azure-pipelines\release.yml = azure-pipelines\release.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj] b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj]
deleted file mode 100644
index e69de29b..00000000