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

Add a hostfxr container version, because even a 1.1.2 hostfxr is being binplaced in a 1.1.0 container.

Browse source
This commit is contained in:
Livar Cunha 2017-04-25 20:38:41 -07:00
parent 1bd6b5e68d
commit 8e7cd5c550
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build.proj
View file

@ -21,6 +21,7 @@
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
<SharedFrameworkVersion>1.1.2</SharedFrameworkVersion>
<SharedHostVersion>1.1.0</SharedHostVersion>
<HostFxrContainerVersion>1.1.0</HostFxrContainerVersion>
<HostFxrVersion Condition=" '$(OS)' != 'Windows_NT' ">1.1.0</HostFxrVersion>
<HostFxrVersion Condition=" '$(OS)' == 'Windows_NT' ">1.1.2</HostFxrVersion>

5
build/Microsoft.DotNet.Cli.Prepare.targets
View file

@ -146,6 +146,7 @@
<AdditionalCoreSetupChannel>preview</AdditionalCoreSetupChannel>
<AdditionalSharedFrameworkVersion>1.0.5</AdditionalSharedFrameworkVersion>
<AdditionalSharedHostVersion>1.0.1</AdditionalSharedHostVersion>
<AdditionalHostFxrContainerVersion>1.0.1</AdditionalHostFxrContainerVersion>
<AdditionalHostFxrVersion Condition=" '$(OSName)' != 'win' ">1.0.1</AdditionalHostFxrVersion>
<AdditionalHostFxrVersion Condition=" '$(OSName)' == 'win' ">1.0.5</AdditionalHostFxrVersion>
@ -201,7 +202,7 @@
<_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile"
Condition="!Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<Url>$(CoreSetupInstallerBlobRootUrl)/$(HostFxrContainerVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<DownloadFileName>$(DownloadedHostFxrInstallerFile)</DownloadFileName>
<ExtractDestintation></ExtractDestintation>
</_DownloadAndExtractItem>
@ -242,7 +243,7 @@
<_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile"
Condition="!Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<Url>$(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrContainerVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<DownloadFileName>$(AdditionalDownloadedHostFxrInstallerFile)</DownloadFileName>
<ExtractDestintation></ExtractDestintation>
</_DownloadAndExtractItem>