From e5f74139a6ede67b2532b247f4dee53868a99926 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 7 Jul 2022 16:40:41 -0700
Subject: [PATCH 1/3] Add the releases dll to the msbuild sdk resolvers folder.

---
 eng/Versions.props                                   | 4 ++++
 src/redist/targets/GenerateMSBuildExtensions.targets | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index a9415cb19..9fee1922c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -208,5 +208,9 @@
     <!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</CLI_NETStandardLibraryNETFrameworkVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
+    <DotNetDeploymentReleasesPackageVersion>1.0.0-preview4.1.22206.3</DotNetDeploymentReleasesPackageVersion>
+  </PropertyGroup>
   <Import Project="$(RepositoryEngineeringDir)ManualVersions.props" />
 </Project>
diff --git a/src/redist/targets/GenerateMSBuildExtensions.targets b/src/redist/targets/GenerateMSBuildExtensions.targets
index 38bf5c09c..b66618eb9 100644
--- a/src/redist/targets/GenerateMSBuildExtensions.targets
+++ b/src/redist/targets/GenerateMSBuildExtensions.targets
@@ -7,11 +7,15 @@
 
       <NETStandardLibraryNETFrameworkPackageName>NETStandard.Library.NETFramework</NETStandardLibraryNETFrameworkPackageName>
       <NETStandardLibraryNETFrameworkNuPkgPath>$(NuGetPackageRoot)$(NETStandardLibraryNETFrameworkPackageName.ToLower())/$(CLI_NETStandardLibraryNETFrameworkVersion.ToLower())</NETStandardLibraryNETFrameworkNuPkgPath>
+
+      <DotNetDeploymentReleasesPackageName>Microsoft.Deployment.DotNet.Releases</DotNetDeploymentReleasesPackageName>
+      <DotNetDeploymentReleasesPkgPath>$(NuGetPackageRoot)$(DotNetDeploymentReleasesPackageName.ToLower())/$(DotNetDeploymentReleasesPackageVersion.ToLower())</DotNetDeploymentReleasesPkgPath>
   </PropertyGroup>
 
   <ItemGroup>
     <ExtensionPackageToRestore Include="$(MSBuildExtensionsPackageName)" Version="$(MicrosoftNETBuildExtensionsPackageVersion)"/>
     <ExtensionPackageToRestore Include="$(NETStandardLibraryNETFrameworkPackageName)" Version="$(CLI_NETStandardLibraryNETFrameworkVersion)"/>
+    <ExtensionPackageToRestore Include="$(DotNetDeploymentReleasesPackageName)" Version="$(DotNetDeploymentReleasesPackageVersion)"/>
   </ItemGroup>
 
   <!-- Restore msbuild extensions via PackageReference -->
@@ -41,6 +45,9 @@
                                   Exclude="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.props;$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.targets"
                                   DeploymentSubpath="msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/" />
 
+      <VSMSBuildExtensionsContent Include="$(DotNetDeploymentReleasesPkgPath)\lib\net452\**\*.*"
+                                  DeploymentSubpath="MSBuildSdkResolver" />
+
       <VSMSBuildExtensionsContent Include="$(SdkResolverLayoutPath)/**/*"
                                   DeploymentSubpath="MSBuildSdkResolver/" />
 

From 4882b9258020d041544d0808a67e0aefe8a95a4e Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 8 Jul 2022 10:02:47 -0700
Subject: [PATCH 2/3] Update Versions.props

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 9fee1922c..16f6571f0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -210,7 +210,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
-    <DotNetDeploymentReleasesPackageVersion>1.0.0-preview4.1.22206.3</DotNetDeploymentReleasesPackageVersion>
+    <DotNetDeploymentReleasesPackageVersion>1.0.0-preview5.1.22263.1</DotNetDeploymentReleasesPackageVersion>
   </PropertyGroup>
   <Import Project="$(RepositoryEngineeringDir)ManualVersions.props" />
 </Project>

From 51754b4c58659ac681698bbded079646d0f39b4a Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 8 Jul 2022 12:10:15 -0700
Subject: [PATCH 3/3] Fix pathing issue in the releases layout in the nuget
 file

---
 src/redist/targets/GenerateMSBuildExtensions.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/redist/targets/GenerateMSBuildExtensions.targets b/src/redist/targets/GenerateMSBuildExtensions.targets
index b66618eb9..c9b8cba70 100644
--- a/src/redist/targets/GenerateMSBuildExtensions.targets
+++ b/src/redist/targets/GenerateMSBuildExtensions.targets
@@ -46,7 +46,7 @@
                                   DeploymentSubpath="msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/" />
 
       <VSMSBuildExtensionsContent Include="$(DotNetDeploymentReleasesPkgPath)\lib\net452\**\*.*"
-                                  DeploymentSubpath="MSBuildSdkResolver" />
+                                  DeploymentSubpath="MSBuildSdkResolver/" />
 
       <VSMSBuildExtensionsContent Include="$(SdkResolverLayoutPath)/**/*"
                                   DeploymentSubpath="MSBuildSdkResolver/" />
@@ -58,4 +58,4 @@
 
     <Copy SourceFiles="@(VSMSBuildExtensionsContent)" DestinationFiles="%(VSMSBuildExtensionsContent.DestinationPath)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>