Adding the SDK version to the hash of the lzma archive, since the SDK has implicit package refs in it that will impact the archive when they change.

This commit is contained in:
Livar Cunha 2017-02-23 01:13:58 -08:00
parent ead36caee1
commit 7f4f35db65
3 changed files with 7 additions and 2 deletions

View file

@ -4,7 +4,7 @@
<CLI_SharedFrameworkVersion>1.1.1</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.1.548</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
<CLI_NETSDK_Version>1.0.0-alpha-20170217-2</CLI_NETSDK_Version>
<CLI_NETSDK_Version>1.0.0-alpha-20170222-1</CLI_NETSDK_Version>
<CLI_NuGet_Version>4.0.0-rtm-2283</CLI_NuGet_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0-preview-20170222-09</CLI_TestPlatform_Version>

View file

@ -120,7 +120,7 @@
<Target Name="SetupNuGetPackagesArchiveInputsOutputs"
DependsOnTargets="Prepare;SetupStage;SetupAzureBlobInformation">
<GenerateNuGetPackagesArchiveVersion ToolPath="$(Stage2Directory)">
<GenerateNuGetPackagesArchiveVersion ToolPath="$(Stage2Directory)" SDKVersion="$(CLI_NETSDK_Version)">
<Output TaskParameter="Version" PropertyName="NuGetPackagesArchiveVersion"/>
</GenerateNuGetPackagesArchiveVersion>
<PropertyGroup>

View file

@ -18,6 +18,9 @@ namespace Microsoft.DotNet.Cli.Build
{
}
[Required]
public string SDKVersion { get; set; }
[Required]
public string ToolPath { get; set; }
@ -70,6 +73,8 @@ namespace Microsoft.DotNet.Cli.Build
Directory.Delete(targetDir, true);
}
dataToHash += SDKVersion;
Log.LogMessage($"NuGet Packages Archive Data To Hash: '{dataToHash}'");
var sha256 = SHA256.Create();