From 9eec757ad1725f799640f5bb888aa857b8c55fef Mon Sep 17 00:00:00 2001
From: Udeesha Gautam <46980425+udeeshagautam@users.noreply.github.com>
Date: Fri, 8 May 2020 17:43:04 -0700
Subject: [PATCH] Updating DacFx nuget to one with SqlTasks (#958)
* Updating DacFx nuget to one with SqlTasks
* Adding common references to build props to avoid multiple places for update
---
Directory.Build.props | 6 ++++++
src/Directory.Build.props | 4 ----
.../Microsoft.SqlTools.ServiceLayer.csproj | 4 +++-
test/Directory.Build.props | 4 ----
...soft.SqlTools.ManagedBatchParser.IntegrationTests.csproj | 1 -
.../Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj | 1 -
6 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 9a81f39c..c423d0dd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,13 @@
160.2004021.0
1.1.1
11.0.1
+ 150.4779.1-preview
true
true
+
+
+
+
+
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 9065ea2a..737b3ac1 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,8 +3,4 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
-
-
-
-
\ No newline at end of file
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj
index 53714944..bbd42597 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj
+++ b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj
@@ -21,7 +21,6 @@
-
@@ -33,6 +32,9 @@
+
+ Always
+
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 9065ea2a..737b3ac1 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -3,8 +3,4 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
-
-
-
-
\ No newline at end of file
diff --git a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.csproj b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.csproj
index 2fe0d8e6..39a7fd64 100644
--- a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.csproj
+++ b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.csproj
@@ -32,7 +32,6 @@
-
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj
index 563d0f66..03c8aae8 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Microsoft.SqlTools.ServiceLayer.IntegrationTests.csproj
@@ -33,7 +33,6 @@
-