mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add patch for XDT prebuilt in nuget-client

Browse source
This commit is contained in:
Logan Bussell 2022-11-21 23:25:59 +00:00
parent 196135f9f3
commit d238d9b6b6
1 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/SourceBuild/tarball/patches/nuget-client/0001-Fix-Microsoft.Web.Xdt-package-version-for-source-bui.patch Normal file
View file

@ -0,0 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Mon, 21 Nov 2022 22:32:04 +0000
Subject: [PATCH] Fix Microsoft.Web.Xdt package version for source-build
Backport: https://github.com/NuGet/Home/issues/12261
---
Directory.Packages.props | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 8afa7dd31..2ee44858d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -14,6 +14,7 @@
<MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'netstandard2.0'">16.8.0</MicrosoftBuildVersion>
<!-- The last package version of MSBuild that works with net5.0 is 16.11.0. Our assemblies are still compiled against MSBuild assembly version 15.1.0.0 which will work with all versions -->
<MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp5.0'">16.11.0</MicrosoftBuildVersion>
+ <MicrosoftWebXdtPackageVersion Condition="'$(MicrosoftWebXdtPackageVersion)' == ''">3.0.0</MicrosoftWebXdtPackageVersion>
</PropertyGroup>
<ItemGroup>
@@ -56,7 +57,7 @@
<PackageVersion Include="Microsoft.VisualStudio.VCProjectEngine" Version="$(VSFrameworkVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Workspace.VSIntegration" Version="17.0.7-preview-0001-g5492e466a9" />
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.0.1600" />
- <PackageVersion Include="Microsoft.Web.Xdt" Version="3.0.0" />
+ <PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)"/>
<PackageVersion Include="Moq" Version="4.18.1" />
<PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />