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

Enabling publish with drop suffix to still publish to a suffix based folder in blob to avoid conflicts.

Browse source
This commit is contained in:
Livar Cunha 2017-02-08 16:53:01 -08:00 • committed by Livar Cunha
parent 35fc8c1d0e
commit d373ce8911
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,9 @@
<VersionSuffix Condition=" '$(DropSuffix)' == '' ">$(ReleaseSuffix)-$(CommitCount)</VersionSuffix> <VersionSuffix Condition=" '$(DropSuffix)' == '' ">$(ReleaseSuffix)-$(CommitCount)</VersionSuffix>
<NugetVersion Condition=" '$(DropSuffix)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(VersionSuffix)</NugetVersion> <FullNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)-$(CommitCount)</FullNugetVersion>
<NugetVersion Condition=" '$(DropSuffix)' == '' ">$(FullNugetVersion)</NugetVersion>
<NugetVersion Condition=" '$(NugetVersion)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch)</NugetVersion> <NugetVersion Condition=" '$(NugetVersion)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch)</NugetVersion>
<SdkVersion>$(NugetVersion)</SdkVersion> <SdkVersion>$(NugetVersion)</SdkVersion>

6
build/Microsoft.DotNet.Cli.Publish.targets
View file

@ -47,7 +47,7 @@
<ItemGroup> <ItemGroup>
<ForPublishing> <ForPublishing>
<RelativeBlobPath>$(Product)/$(NugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath> <RelativeBlobPath>$(Product)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
</ForPublishing> </ForPublishing>
</ItemGroup> </ItemGroup>
</Target> </Target>
@ -62,7 +62,7 @@
<SdkInstallerFileItemGroup Include="$(SdkInstallerFile)" /> <SdkInstallerFileItemGroup Include="$(SdkInstallerFile)" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(NugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)</SdkDebianUploadUrl> <SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(FullNugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)</SdkDebianUploadUrl>
<DebianUploadJsonFile>$(SdkDebianIntermediateDirectory)/package_upload.json</DebianUploadJsonFile> <DebianUploadJsonFile>$(SdkDebianIntermediateDirectory)/package_upload.json</DebianUploadJsonFile>
<DebianRevisionNumber>1</DebianRevisionNumber> <DebianRevisionNumber>1</DebianRevisionNumber>
@ -89,7 +89,7 @@
<ItemGroup> <ItemGroup>
<CliVersionBadgeToUpload> <CliVersionBadgeToUpload>
<RelativeBlobPath>$(Product)/$(NugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath> <RelativeBlobPath>$(Product)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
</CliVersionBadgeToUpload> </CliVersionBadgeToUpload>
</ItemGroup> </ItemGroup>

6
build/publish/FinishBuild.targets
View file

@ -8,7 +8,7 @@
<CheckIfAllBuildsHavePublished AccountKey="$(ArtifactCloudDropAccessToken)" <CheckIfAllBuildsHavePublished AccountKey="$(ArtifactCloudDropAccessToken)"
AccountName="$(ArtifactCloudDropAccountName)" AccountName="$(ArtifactCloudDropAccountName)"
ContainerName="$(ArtifactContainerName)" ContainerName="$(ArtifactContainerName)"
NugetVersion="$(NugetVersion)"> NugetVersion="$(FullNugetVersion)">
<Output TaskParameter="HaveAllBuildsPublished" PropertyName="HaveAllBuildsPublished" /> <Output TaskParameter="HaveAllBuildsPublished" PropertyName="HaveAllBuildsPublished" />
</CheckIfAllBuildsHavePublished> </CheckIfAllBuildsHavePublished>
</Target> </Target>
@ -18,14 +18,14 @@
<CopyBlobsToLatest AccountName="$(ArtifactCloudDropAccountName)" <CopyBlobsToLatest AccountName="$(ArtifactCloudDropAccountName)"
AccountKey="$(ArtifactCloudDropAccessToken)" AccountKey="$(ArtifactCloudDropAccessToken)"
ContainerName="$(ArtifactContainerName)" ContainerName="$(ArtifactContainerName)"
NugetVersion="$(NugetVersion)" NugetVersion="$(FullNugetVersion)"
Channel="$(Channel)" Channel="$(Channel)"
CommitHash="$(CommitHash)" /> CommitHash="$(CommitHash)" />
<CopyBlobsToLatest AccountName="$(ChecksumCloudDropAccountName)" <CopyBlobsToLatest AccountName="$(ChecksumCloudDropAccountName)"
AccountKey="$(ChecksumCloudDropAccessToken)" AccountKey="$(ChecksumCloudDropAccessToken)"
ContainerName="$(ChecksumContainerName)" ContainerName="$(ChecksumContainerName)"
NugetVersion="$(NugetVersion)" NugetVersion="$(FullNugetVersion)"
Channel="$(Channel)" Channel="$(Channel)"
CommitHash="$(CommitHash)" /> CommitHash="$(CommitHash)" />

2
packaging/windows/clisdk/registrykeys.wxs
View file

@ -10,7 +10,7 @@
</Component> </Component>
<Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no"> <Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no">
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk"> <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk">
<RegistryValue Action="write" Name="1.0.0" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Action="write" Name="1.0.0-rc4" Type="integer" Value="1" KeyPath="yes"/>
</RegistryKey> </RegistryKey>
</Component> </Component>
</ComponentGroup> </ComponentGroup>