From 9954f5a703634cec536a8908c6326a39f526cc73 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Mon, 19 Nov 2018 11:16:03 -0800
Subject: [PATCH] Fix MSB4062 - fix conflicting build tools dependencies by
 ensuring the same version is used

---
 build/repo.props                                         | 2 +-
 src/SiteExtensions/Directory.Build.props                 | 5 +++++
 src/SiteExtensions/build/dependencies.props              | 7 ++-----
 src/SiteExtensions/build/repo.props                      | 9 ++++-----
 src/SiteExtensions/global.json                           | 4 ++--
 .../Microsoft.Web.Xdt.Extensions.csproj                  | 5 ++---
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build/repo.props b/build/repo.props
index a9d3fdec06..c2abd8c8c7 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -50,7 +50,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <SamplesProject Include="$(RepositoryRoot)src\samples\**\*.csproj;"/>
+    <SamplesProject Include="$(RepositoryRoot)src\**\samples\**\*.csproj;"/>
 
     <ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/>
 
diff --git a/src/SiteExtensions/Directory.Build.props b/src/SiteExtensions/Directory.Build.props
index b6e2f87d64..4710620462 100644
--- a/src/SiteExtensions/Directory.Build.props
+++ b/src/SiteExtensions/Directory.Build.props
@@ -5,4 +5,9 @@
   <Import Project="build\dependencies.props" />
   <Import Project="version.props" />
 
+  <PropertyGroup>
+    <EnableApiCheck>false</EnableApiCheck>
+    <GenerateSourceLinkFile>false</GenerateSourceLinkFile>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/SiteExtensions/build/dependencies.props b/src/SiteExtensions/build/dependencies.props
index f17068b5eb..ef1eb218ff 100644
--- a/src/SiteExtensions/build/dependencies.props
+++ b/src/SiteExtensions/build/dependencies.props
@@ -3,14 +3,11 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
+  <Import Project="..\..\..\build\dependencies.props" />
+
   <PropertyGroup Label="Package Versions">
-    <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1-rtm-31076</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0-rtm-35515</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
-    <MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
-    <XunitPackageVersion>2.4.0</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/SiteExtensions/build/repo.props b/src/SiteExtensions/build/repo.props
index 25129c9001..4fcd933beb 100644
--- a/src/SiteExtensions/build/repo.props
+++ b/src/SiteExtensions/build/repo.props
@@ -1,8 +1,7 @@
 <Project>
 
-
-  <ItemGroup>
-    <ExcludeFromPack Include="$(RepositoryRoot)src\Microsoft.Web.Xdt.Extensions\*.csproj" />
-  </ItemGroup>
-
+  <PropertyGroup>
+    <!-- Disable KoreBuild restrictions while we re-work dependency management. -->
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+  </PropertyGroup>
 </Project>
diff --git a/src/SiteExtensions/global.json b/src/SiteExtensions/global.json
index bf91e8bc39..6df6220662 100644
--- a/src/SiteExtensions/global.json
+++ b/src/SiteExtensions/global.json
@@ -1,8 +1,8 @@
 {
     "sdk": {
-        "version": "2.2.100-preview3-009430"
+        "version": "3.0.100-preview-009750"
     },
     "msbuild-sdks": {
-        "Internal.AspNetCore.Sdk": "3.0.0-alpha1-20181018.6"
+        "Internal.AspNetCore.Sdk": "3.0.0-build-20181114.5"
     }
 }
diff --git a/src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj b/src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj
index 4222ec4e2d..170d75c0bd 100644
--- a/src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj
+++ b/src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj
@@ -3,12 +3,11 @@
   <PropertyGroup>
     <Description>Additional functionality for Xdt transforms.</Description>
     <TargetFramework>net461</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>xdt</PackageTags>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>