Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into enable-tarball-ci

This commit is contained in:
MichaelSimons 2021-10-06 15:18:06 +00:00
commit ca1402aefa
3 changed files with 3 additions and 3 deletions

View file

@ -19,7 +19,7 @@
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rtm.21504.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>6c5c32d56ec74280783664c2526937d23cfc3467</Sha>
<Sha>ebaef9c408aedefd675dfcaea253ef5d7e7f8665</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rtm.21504.6" CoherentParentDependency="Microsoft.NET.Sdk">

View file

@ -105,7 +105,7 @@
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
</PropertyGroup>
<PropertyGroup>
<WixPackageVersion>1.0.0-v3.14.0.4118</WixPackageVersion>
<WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- 6.0 Template versions -->

View file

@ -13,7 +13,7 @@
<Target Name="SetupWixProperties" DependsOnTargets="GetCurrentRuntimeInformation">
<!-- AcquireWix Properties -->
<PropertyGroup>
<WixVersion>1.0.0-v3.14.0.4118</WixVersion>
<WixVersion>$(WixPackageVersion)</WixVersion>
<WixDownloadUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip</WixDownloadUrl>
<WixRoot>$(ArtifactsDir)Tools/WixTools/$(WixVersion)</WixRoot>
<WixDestinationPath>$(WixRoot)/WixTools.$(WixVersion).zip</WixDestinationPath>