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

Merge pull request #13385 from dotnet/marcpopMSFT-fixduplicatepackages

Browse source 
Fix duplicate packages
This commit is contained in:
Marc Paine 2022-03-10 13:59:49 -08:00 • committed by GitHub
commit c10ad05ffb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/redist/targets/GenerateMSIs.targets
View file

@ -491,7 +491,8 @@
'$(MSBuildExtensionsLayoutDirectory.TrimEnd('\'))' ^ '$(MSBuildExtensionsLayoutDirectory.TrimEnd('\'))' ^
'$(FullNugetVersion)' ^ '$(FullNugetVersion)' ^
'$(SdkMSBuildExtensionsNuspecFile)' ^ '$(SdkMSBuildExtensionsNuspecFile)' ^
'$(SdkMSBuildExtensionsNupkgFile)'" /> '$(SdkMSBuildExtensionsNupkgFile)' ^
'$(Architecture)'" />
<GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)" <GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)"
OutputFile="$(SdkMSBuildExtensionsSwrFile)"/> OutputFile="$(SdkMSBuildExtensionsSwrFile)"/>
@ -511,7 +512,8 @@
'$(VSTemplateLocatorLayoutPath.TrimEnd('\'))' ^ '$(VSTemplateLocatorLayoutPath.TrimEnd('\'))' ^
'$(FullNugetVersion)' ^ '$(FullNugetVersion)' ^
'$(VSTemplateLocatorNuspecFile)' ^ '$(VSTemplateLocatorNuspecFile)' ^
'$(VSTemplateLocatorNupkgFile)'" /> '$(VSTemplateLocatorNupkgFile)' ^
'$(Architecture)'" />
</Target> </Target>