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

Revert prior changes as only the first and last change were actually needed.

Browse source
This commit is contained in:
Marc Paine 2022-03-14 14:27:34 -07:00
parent 37f553ace2
commit ab3ddec440
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -480,7 +480,7 @@
<Target Name="GenerateSdkMSBuildExtensionsNupkg" <Target Name="GenerateSdkMSBuildExtensionsNupkg"
DependsOnTargets="GenerateLayout;GenerateMSBuildExtensions;MsiTargetsSetupInputOutputs" DependsOnTargets="GenerateLayout;GenerateMSBuildExtensions;MsiTargetsSetupInputOutputs"
Condition=" '$(OS)' == 'Windows_NT' And ('$(Architecture)' == 'x64' Or '$(Architecture)' == 'arm64') " Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "
Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*; Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*;
$(SdkMSBuildExtensionsNuspecFile); $(SdkMSBuildExtensionsNuspecFile);
$(GenerateNupkgPowershellScript)" $(GenerateNupkgPowershellScript)"
@ -491,18 +491,16 @@
'$(MSBuildExtensionsLayoutDirectory.TrimEnd('\'))' ^ '$(MSBuildExtensionsLayoutDirectory.TrimEnd('\'))' ^
'$(FullNugetVersion)' ^ '$(FullNugetVersion)' ^
'$(SdkMSBuildExtensionsNuspecFile)' ^ '$(SdkMSBuildExtensionsNuspecFile)' ^
'$(SdkMSBuildExtensionsNupkgFile)' ^ '$(SdkMSBuildExtensionsNupkgFile)'" />
'$(Architecture)'" />
<GenerateMSBuildExtensionsSWR Condition="'$(Architecture)' == 'x64'" <GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)"
MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)"
OutputFile="$(SdkMSBuildExtensionsSwrFile)"/> OutputFile="$(SdkMSBuildExtensionsSwrFile)"/>
</Target> </Target>
<Target Name="GenerateVSTemplateLocatorNupkg" <Target Name="GenerateVSTemplateLocatorNupkg"
DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs" DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
Condition=" '$(OS)' == 'Windows_NT' And ('$(Architecture)' == 'x64' Or '$(Architecture)' == 'arm64') " Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "
Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*; Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*;
$(VSTemplateLocatorNuspecFile); $(VSTemplateLocatorNuspecFile);
$(GenerateNupkgPowershellScript)" $(GenerateNupkgPowershellScript)"
@ -513,8 +511,7 @@
'$(VSTemplateLocatorLayoutPath.TrimEnd('\'))' ^ '$(VSTemplateLocatorLayoutPath.TrimEnd('\'))' ^
'$(FullNugetVersion)' ^ '$(FullNugetVersion)' ^
'$(VSTemplateLocatorNuspecFile)' ^ '$(VSTemplateLocatorNuspecFile)' ^
'$(VSTemplateLocatorNupkgFile)' ^ '$(VSTemplateLocatorNupkgFile)'" />
'$(Architecture)'" />
</Target> </Target>

4
src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$</id> <id>VS.Redist.Common.Net.Core.SDK.MSBuildExtensions</id>
<version>1.0.0</version> <version>1.0.0</version>
<title>VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$ARCH$</title> <title>VS.Redist.Common.Net.Core.SDK.MSBuildExtensions</title>
<authors>Microsoft</authors> <authors>Microsoft</authors>
<owners>Microsoft</owners> <owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl> <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>

4
src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$</id> <id>VS.Redist.Common.Net.Core.SDK.VSTemplateLocator</id>
<version>1.0.0</version> <version>1.0.0</version>
<title>VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$ARCH$</title> <title>VS.Redist.Common.Net.Core.SDK.VSTemplateLocator</title>
<authors>Microsoft</authors> <authors>Microsoft</authors>
<owners>Microsoft</owners> <owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl> <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>