From 9659749eebd07819267d85c2b3826eded89346c9 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Fri, 9 Jun 2017 18:18:55 -0700
Subject: [PATCH] Update version of SDK and MS.NET.Build.Extensions, adapt to
 layout change

---
 build/DependencyVersions.props  | 9 +++++++--
 build/MSBuildExtensions.targets | 8 ++++----
 src/redist/redist.csproj        | 4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 78ad03a21..78f77b319 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -6,9 +6,14 @@
     <CLI_Roslyn_Version>2.3.0-beta2-61716-09</CLI_Roslyn_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
     <CLI_FSharp_Version>4.2.0-rc-170602-0</CLI_FSharp_Version>
-    <CLI_NETSDK_Version>2.0.0-preview2-20170608-2</CLI_NETSDK_Version>
+    
+    <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
+         cases, so use separate properties but derive one from the other unless we want to
+         explicitly use different versions. -->
+    <CLI_NETSDK_Version>2.0.0-preview2-20170610-3</CLI_NETSDK_Version>
+    <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
+    
     <CLI_NuGet_Version>4.3.0-preview3-4146</CLI_NuGet_Version>
-    <CLI_MSBuildExtensions_Version>2.0.0-preview2-20170608-2</CLI_MSBuildExtensions_Version>
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview2-25331-02</CLI_NETStandardLibraryNETFrameworkVersion>
     <CLI_WEBSDK_Version>2.0.0-rel-20170518-512</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.3.0-preview-20170609-02</CLI_TestPlatform_Version>
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index 3a2479958..fcc987cda 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -16,26 +16,26 @@
            we generate it.
            -->
       <MSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\**\*.*"
-                                Exclude="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft.NET.Build.Extensions\net*\**" />
+                                Exclude="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\net*\**" />
 
       <MSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions-ver\**\*.*"
                                 DeploymentSubpath="$(MSBuildExtensionsVersionSubfolder)/" />
       
       <MSBuildExtensionsContent Include="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.*"
                                 Exclude="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.props;$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.targets"
-                                DeploymentSubpath="Microsoft.NET.Build.Extensions/" />
+                                DeploymentSubpath="Microsoft/Microsoft.NET.Build.Extensions/" />
 
 
       <!-- The VSMSBuildExtensionsContent item is for the files that will be included in the VS.Redist.Common.Net.Core.SDK.MSBuildExtensions
            package and inserted into Visual Studio -->
       <VSMSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\**\*.*"
-                                  Exclude="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft.NET.Build.Extensions\net*\**"
+                                  Exclude="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\net*\**"
                                   DeploymentSubpath="msbuildExtensions/"/>
       <VSMSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions-ver\**\*.*"
                                   DeploymentSubpath="msbuildExtensions-ver/"/>
       <VSMSBuildExtensionsContent Include="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.*"
                                   Exclude="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.props;$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.targets"
-                                  DeploymentSubpath="msbuildExtensions/Microsoft.NET.Build.Extensions/" />
+                                  DeploymentSubpath="msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/" />
 
       <VSMSBuildExtensionsContent Update="@(VSMSBuildExtensionsContent)">
         <DestinationPath >$(MSBuildExtensionsLayoutDirectory)/%(VSMSBuildExtensionsContent.DeploymentSubpath)%(RecursiveDir)%(Filename)%(Extension)</DestinationPath>
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 418b90f51..1394361be 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -196,10 +196,10 @@
       <SdkFiles Include="$(PublishDir)/**/*" Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*" />
 
       <!-- Don't try to CrossGen .NET Framework support assemblies for .NET Standard -->
-      <SdkFiles Remove="$(PublishDir)/Microsoft.NET.Build.Extensions\net*\**\*" />
+      <SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />
 
       <!-- Don't try to CrossGen tasks and supporting DLLs compiled for .NET Framework -->
-      <SdkFiles Remove="$(PublishDir)/Microsoft.NET.Build.Extensions\tools\net*\**\*" />
+      <SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\tools\net*\**\*" />
     </ItemGroup>
 
     <AddMetadataIsPE Items="@(SdkFiles)">