Switching from using commit height for versioning to using Arcade's scheme.

2019-12-20 13:13:26 -08:00 · 2019-12-20 13:13:26 -08:00 · 72f288ab58
commit 72f288ab58
parent 593590d964
19 changed files with 73 additions and 165 deletions
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@ -46,30 +46,21 @@ stages:
              _BuildConfig: Debug
              _BuildArchitecture: x86
              _DOTNET_CLI_UI_LANGUAGE: ''
-              _DropSuffix: ''
            Build_ES_Debug_x64:
              _BuildConfig: Debug
              _BuildArchitecture: x64
              _DOTNET_CLI_UI_LANGUAGE: es
-              _DropSuffix: ''
-            Build_DropSuffix_Release_x64:
-              _BuildConfig: Release
-              _BuildArchitecture: x64
-              _DOTNET_CLI_UI_LANGUAGE: ''
-              _DropSuffix: true
          # Internal-only builds
          ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
            Build_Release_x86:
              _BuildConfig: Release
              _BuildArchitecture: x86
              _DOTNET_CLI_UI_LANGUAGE: ''
-              _DropSuffix: ''
          # Always run builds
          Build_Release_x64:
            _BuildConfig: Release
            _BuildArchitecture: x64
            _DOTNET_CLI_UI_LANGUAGE: ''
-            _DropSuffix: ''
            _AdditionalBuildParameters: '/p:PublishInternalAsset=true
              /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
              /p:DotNetPublishBlobFeedUrl=$(_ArcadePublishBlobFeedUrl)'
@ -77,7 +68,6 @@ stages:
            _BuildConfig: Release
            _BuildArchitecture: arm
            _DOTNET_CLI_UI_LANGUAGE: ''
-            _DropSuffix: ''

  - template: /eng/build.yml
    parameters:
@ -94,84 +84,60 @@ stages:
              _LinuxPortable: ''
              _RuntimeIdentifier: ''
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
            Build_Ubuntu_18_04_Debug_x64:
              _BuildConfig: Debug
              _DockerParameter: '--docker ubuntu.18.04'
              _LinuxPortable: '--linux-portable'
              _RuntimeIdentifier: ''
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
            Build_Fedora_29_Debug_x64:
              _BuildConfig: Debug
              _DockerParameter: '--docker fedora.29'
              _LinuxPortable: '--linux-portable'
              _RuntimeIdentifier: ''
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
            Build_CentOS_7_1_Debug_x64:
              _BuildConfig: Debug
              _DockerParameter: '--docker centos'
              _LinuxPortable: ''
              _RuntimeIdentifier: ''
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
            Build_Debian_Stretch_Debug_x64:
              _BuildConfig: Debug
              _DockerParameter: '--docker debian'
              _LinuxPortable: ''
              _RuntimeIdentifier: ''
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
            Build_Rhel_7_2_Release_x64:
              _BuildConfig: Release
              _DockerParameter: '--docker rhel'
              _LinuxPortable: ''
              _RuntimeIdentifier: ''
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
            Build_Rhel_6_Debug_x64:
              _BuildConfig: Debug
              _DockerParameter: '--docker rhel.6'
              _LinuxPortable: ''
              _RuntimeIdentifier: '--runtime-id rhel.6-x64'
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
            Build_Arm_Debug:
              _BuildConfig: Debug
              _DockerParameter: ''
              _LinuxPortable: '--linux-portable'
              _RuntimeIdentifier: '--runtime-id linux-arm'
              _BuildArchitecture: 'arm'
-              _DropSuffix: ''
            Build_Arm64_Debug:
              _BuildConfig: Debug
              _DockerParameter: ''
              _LinuxPortable: '--linux-portable'
              _RuntimeIdentifier: '--runtime-id linux-arm64'
              _BuildArchitecture: 'arm64'
-              _DropSuffix: ''
            Build_Linux_musl_Debug_x64:
              _BuildConfig: Debug
              _DockerParameter: '--docker alpine.3.6'
              _LinuxPortable: ''
              _RuntimeIdentifier: '--runtime-id linux-musl-x64'
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
-            Build_LinuxPortable_NoSuffix_Release_x64:
-              _BuildConfig: Release
-              _DockerParameter: ''
-              _LinuxPortable: '--linux-portable'
-              _RuntimeIdentifier: ''
-              _BuildArchitecture: 'x64'
-              _DropSuffix: true
-            Build_Arm_NoSuffix_Release:
-              _BuildConfig: Release
-              _DockerParameter: ''
-              _LinuxPortable: '--linux-portable'
-              _RuntimeIdentifier: '--runtime-id linux-arm'
-              _BuildArchitecture: 'arm'
-              _DropSuffix: true
          ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
            Build_Arm_Release:
              _BuildConfig: Release
@ -179,35 +145,30 @@ stages:
              _LinuxPortable: '--linux-portable'
              _RuntimeIdentifier: '--runtime-id linux-arm'
              _BuildArchitecture: 'arm'
-              _DropSuffix: ''
            Build_Arm64_Release:
              _BuildConfig: Release
              _DockerParameter: ''
              _LinuxPortable: '--linux-portable'
              _RuntimeIdentifier: '--runtime-id linux-arm64'
              _BuildArchitecture: 'arm64'
-              _DropSuffix: ''
            Build_Rhel_6_Release_x64:
              _BuildConfig: Release
              _DockerParameter: '--docker rhel.6'
              _LinuxPortable: ''
              _RuntimeIdentifier: '--runtime-id rhel.6-x64'
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
            Build_Linux_musl_Release_x64:
              _BuildConfig: Release
              _DockerParameter: '--docker alpine.3.6'
              _LinuxPortable: ''
              _RuntimeIdentifier: '--runtime-id linux-musl-x64'
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
            Build_Linux_Portable_Deb_Release_x64:
              _BuildConfig: Release
              _DockerParameter: '--docker ubuntu.16.04'
              _LinuxPortable: '--linux-portable'
              _RuntimeIdentifier: ''
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
              # Do not publish zips and tarballs. The linux-x64 binaries are
              # already published by Build_LinuxPortable_Release_x64
              _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false'
@ -217,7 +178,6 @@ stages:
              _LinuxPortable: '--linux-portable'
              _RuntimeIdentifier: ''
              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
              # Do not publish zips and tarballs. The linux-x64 binaries are
              # already published by Build_LinuxPortable_Release_x64
              _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false'
@ -227,7 +187,6 @@ stages:
            _LinuxPortable: '--linux-portable'
            _RuntimeIdentifier: ''
            _BuildArchitecture: 'x64'
-            _DropSuffix: ''

  - template: /eng/build.yml
    parameters:
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
 <Project>
-
-  <Import Project="$(RepoRoot)\src\redist\targets\Versions.targets" />
-
  <PropertyGroup>
    <Product>Sdk</Product>
    <BlobStoragePartialRelativePath>$(Product)</BlobStoragePartialRelativePath>
@ -56,19 +53,18 @@

  <Target Name="PublishSdkAssetsAndChecksums"
          BeforeTargets="Publish"
-          DependsOnTargets="SetSdkVersionInfo"
          Condition=" '$(PublishSdkAssetsAndChecksumsToBlob)' == 'true' ">

    <!-- If the sdk version is stabilized, then we should double publish the binaries to suffixed file names.
         To do this, create new copies of the blobs, replacing the SdkVersion string in the file name with the
         FullNugetVersion, except if the FullNuGetVersion is already in the file name (which would end up
         publishing the same exact file name twice). -->
-    <ItemGroup Condition="'$(DropSuffix)'== 'true'">
-        <SdkAssetsToCopyWithSuffix Include="@(SdkAssetsToPublish)" Condition="'$([System.String]::Copy(`%(Filename)`).Contains(`$(SdkVersion)`))' == 'true'">
-          <SuffixedPath>$(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(SdkVersion)' ,'$(FullNuGetVersion)'))</SuffixedPath>
+    <ItemGroup Condition="'$(DotNetFinalVersionKind)'== 'release'">
+        <SdkAssetsToCopyWithSuffix Include="@(SdkAssetsToPublish)" Condition="'$([System.String]::Copy(`%(Filename)`).Contains(`$(Version)`))' == 'true'">
+          <SuffixedPath>$(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)'))</SuffixedPath>
        </SdkAssetsToCopyWithSuffix>
-        <CheckSumsToCopyWithSuffix Include="@(CheckSumsToPublish)" Condition="'$([System.String]::Copy(`%(Filename)`).Contains(`$(SdkVersion)`))' == 'true'">
-          <SuffixedPath>$(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(SdkVersion)' ,'$(FullNuGetVersion)'))</SuffixedPath>
+        <CheckSumsToCopyWithSuffix Include="@(CheckSumsToPublish)" Condition="'$([System.String]::Copy(`%(Filename)`).Contains(`$(Version)`))' == 'true'">
+          <SuffixedPath>$(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)'))</SuffixedPath>
        </CheckSumsToCopyWithSuffix>
    </ItemGroup>

@ -103,7 +99,7 @@
        <ManifestArtifactData>NonShipping=true</ManifestArtifactData>
      </SdkAssetsWithSuffixToPushToBlobFeed>

-      <ChecksumsWithSuffixToPushToBlobFeed Include="@(CheckSumsToPublishWithSuffix)" Condition="'$(DropSuffix)'== 'true'">
+      <ChecksumsWithSuffixToPushToBlobFeed Include="@(CheckSumsToPublishWithSuffix)" Condition="'$(DotNetFinalVersionKind)'== 'release'">
        <RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
        <ManifestArtifactData>NonShipping=true</ManifestArtifactData>
      </ChecksumsWithSuffixToPushToBlobFeed>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -4,12 +4,21 @@
  <PropertyGroup>
    <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
  </PropertyGroup>
-  <!-- This is a fake version to fool arcade. In this repo, we handle the versioning
-  of assets ourselves, since all we do is generate zips/tarballs and native installers.
-  To actually update the version for this repo, look at src/redist/targets/Versions.targets -->
  <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
+    <VersionMajor>5</VersionMajor>
+    <VersionMinor>0</VersionMinor>
+    <VersionSDKMinor>1</VersionSDKMinor>
+    <VersionPatch>00</VersionPatch>
+
+    <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionPatch)</VersionPrefix>
+    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
+    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+
+    <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
+    <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
+    <SDKBundleVersion>$(VersionPrefix).$(_BuildNumberLabels)</SDKBundleVersion>
+
+    <FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel)$(PreReleaseVersionIteration)-$(_BuildNumberLabels)</FullNugetVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/toolset -->
--- a/eng/build.yml
+++ b/eng/build.yml
@ -84,7 +84,6 @@ phases:
        displayName: Build
        env:
          DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE)
-          DropSuffix: $(_DropSuffix)
          DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN)

    - ${{ if ne(parameters.agentOs, 'Windows_NT') }}:
@ -104,7 +103,6 @@ phases:
                  $(_AdditionalBuildParameters)
        displayName: Build
        env:
-          DropSuffix: $(_DropSuffix)
          DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN)

    - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}:
--- a/src/CopyToLatest/CopyToLatest.csproj
+++ b/src/CopyToLatest/CopyToLatest.csproj
@ -8,7 +8,6 @@
  <Import Project="targets\BranchInfo.props" />
  <Import Project="..\redist\targets\BuildCoreSdkTasks.targets" />
  <Import Project="..\redist\targets\GetRuntimeInformation.targets" />
-  <Import Project="..\redist\targets\Versions.targets" />
  <Import Project="..\redist\targets\SetBuildDefaults.targets" />
  
  <Import Project="targets\FinishBuild.targets" />
--- a/src/CopyToLatest/targets/FinishBuild.targets
+++ b/src/CopyToLatest/targets/FinishBuild.targets
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Target Name="FinalizeBuild"
-          DependsOnTargets="SetSdkVersionInfo"
          BeforeTargets="AfterBuild">
    <CopyBlobsToLatest FeedUrl="$(DotnetPublishSdkAssetsBlobFeedUrl)"
                       AccountKey="$(DotNetPublishSdkAssetsBlobFeedKey)"
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@ -21,7 +21,6 @@

  <Import Project="targets\BuildCoreSdkTasks.targets" />
  <Import Project="targets\GetRuntimeInformation.targets" />
-  <Import Project="targets\Versions.targets" />
  <Import Project="targets\SetBuildDefaults.targets" />
  <Import Project="targets\Branding.targets" />
  <Import Project="targets\BundledTemplates.targets" />
--- a/src/redist/targets/Badge.targets
+++ b/src/redist/targets/Badge.targets
@ -13,7 +13,7 @@
      InputFiles="$(VersionSvgTemplate)"
      DestinationFiles="$(VersionBadge)"
      ReplacementPatterns="ver_number"
-      ReplacementStrings="$(SdkVersion)" />
+      ReplacementStrings="$(Version)" />
  </Target>

  <Target Name="SetBadgeProps" DependsOnTargets="GetCurrentRuntimeInformation">
--- a/src/redist/targets/Branding.targets
+++ b/src/redist/targets/Branding.targets
@ -1,9 +1,9 @@
 <Project>
-  <Target Name="SetSdkBrandingInfo" DependsOnTargets="SetSdkVersionInfo">
+  <Target Name="SetSdkBrandingInfo">
    <PropertyGroup>
      <BuildName>cli</BuildName>
-      <SdkBrandName>Microsoft .NET Core SDK $(CliBrandingVersion)</SdkBrandName>
-      <ToolsetBrandName>Microsoft .NET Core Toolset $(CliBrandingVersion)</ToolsetBrandName>
+      <SdkBrandName>Microsoft .NET Core SDK $(Version)</SdkBrandName>
+      <ToolsetBrandName>Microsoft .NET Core Toolset $(Version)</ToolsetBrandName>
      <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
      <SharedFrameworkBrandName>Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkBrandName>
      <NetCoreAppTargetingPackBrandName>Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackBrandName>
@ -13,10 +13,10 @@
      <HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(HostFxrVersion)</HostFxrBrandName>
      <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
      <SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
-      <BundledTemplates31BrandName>Microsoft .NET Core 3.1 Templates $(CliBrandingVersion)</BundledTemplates31BrandName>
-      <BundledTemplates30BrandName>Microsoft .NET Core 3.0 Templates $(CliBrandingVersion)</BundledTemplates30BrandName>
-      <BundledTemplates22BrandName>Microsoft .NET Core 2.2 Templates $(CliBrandingVersion)</BundledTemplates22BrandName>
-      <BundledTemplates21BrandName>Microsoft .NET Core 2.1 Templates $(CliBrandingVersion)</BundledTemplates21BrandName>
+      <BundledTemplates31BrandName>Microsoft .NET Core 3.1 Templates $(Version)</BundledTemplates31BrandName>
+      <BundledTemplates30BrandName>Microsoft .NET Core 3.0 Templates $(Version)</BundledTemplates30BrandName>
+      <BundledTemplates22BrandName>Microsoft .NET Core 2.2 Templates $(Version)</BundledTemplates22BrandName>
+      <BundledTemplates21BrandName>Microsoft .NET Core 2.1 Templates $(Version)</BundledTemplates21BrandName>
    </PropertyGroup>
  </Target>
  
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@ -1,6 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="CalculateTemplatesVersions"
-          DependsOnTargets="SetSdkVersionInfo">
+  <Target Name="CalculateTemplatesVersions">
    <PropertyGroup>
      <AspNetCore31VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor31Templates.IndexOf('-'))</AspNetCore31VersionPreReleaseSeparator>
      <AspNetCore31VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor31Templates)</AspNetCore31VersionMajorMinorPatchVersion>
--- a/src/redist/targets/Crossgen.targets
+++ b/src/redist/targets/Crossgen.targets
@ -134,7 +134,7 @@

    <!-- Move symbols to separate folder, they are not included in the layout but are published separately -->
    <Move SourceFiles="@(PdbsToMove)"
-          DestinationFiles="@(PdbsToMove->'$(ArtifactsSymStoreDirectory)/sdk/$(SdkVersion)/%(RecursiveDir)%(Filename)%(Extension)')" />
+          DestinationFiles="@(PdbsToMove->'$(ArtifactsSymStoreDirectory)/sdk/$(Version)/%(RecursiveDir)%(Filename)%(Extension)')" />
  </Target>

  <Target Name="ChmodLayout"
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@ -36,8 +36,8 @@
      <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>
      <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion>

-      <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DropSuffix)' != 'true' ">true</_NETCoreSdkBeingBuiltIsPreview>
-      <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DropSuffix)' == 'true' ">false</_NETCoreSdkBeingBuiltIsPreview>
+      <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DotNetFinalVersionKind)' != 'release' ">true</_NETCoreSdkBeingBuiltIsPreview>
+      <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</_NETCoreSdkBeingBuiltIsPreview>
    </PropertyGroup>

    <ItemGroup>
@ -157,7 +157,7 @@ Copyright (c) .NET Foundation. All rights reserved.
    <BundledNETStandardPackageVersion>$(_NETStandardLibraryPackageVersion)</BundledNETStandardPackageVersion>
    <BundledNETCorePlatformsPackageVersion>$(_NETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
    <BundledRuntimeIdentifierGraphFile>%24(MSBuildThisFileDirectory)RuntimeIdentifierGraph.json</BundledRuntimeIdentifierGraphFile>
-    <NETCoreSdkVersion>$(SdkVersion)</NETCoreSdkVersion>
+    <NETCoreSdkVersion>$(Version)</NETCoreSdkVersion>
    <NETCoreSdkRuntimeIdentifier>$(ProductMonikerRid)</NETCoreSdkRuntimeIdentifier>
    <_NETCoreSdkIsPreview>$(_NETCoreSdkBeingBuiltIsPreview)</_NETCoreSdkIsPreview>
  </PropertyGroup>
--- a/src/redist/targets/GenerateDebs.targets
+++ b/src/redist/targets/GenerateDebs.targets
@ -7,8 +7,7 @@
  </ItemGroup>
  
  <Target Name="SetupDebProps"
-        DependsOnTargets="SetSdkVersionInfo;
-                          GetCurrentRuntimeInformation;
+        DependsOnTargets="GetCurrentRuntimeInformation;
                          SetupFileExtensions;
                          CalculateLinuxNativeInstallerDependencyVersions;
                          SetSdkBrandingInfo">
@ -172,7 +171,7 @@
        <ReplacementString>$(AspNetCoreRefVersionWithTilde)</ReplacementString>
      </DebianConfigTokenValues>
      <DebianPostInstTokenValues Include="%SDK_VERSION%">
-        <ReplacementString>$(SdkVersion)</ReplacementString>
+        <ReplacementString>$(Version)</ReplacementString>
      </DebianPostInstTokenValues>
    </ItemGroup>

@ -264,7 +263,7 @@

      <!-- Create layout: Man Pages -->
      <Copy
-        DestinationFiles="@(SdkDebManPageFiles->'$(LayoutDocsDir)/%(RecursiveDir)%(Filename)-$(SdkVersion)%(Extension)')"
+        DestinationFiles="@(SdkDebManPageFiles->'$(LayoutDocsDir)/%(RecursiveDir)%(Filename)-$(Version)%(Extension)')"
        SourceFiles="@(SdkDebManPageFiles)"
        OverwriteReadOnlyFiles="True"
        SkipUnchangedFiles="False"
@ -291,7 +290,7 @@
                     InputDirectory="$(LayoutDirectory)"
                     OutputDirectory="$(DotNetDebToolOutputDirectory)"
                     PackageName="$(SdkDebianPackageName)"
-                     PackageVersion="$(SdkVersion)"
+                     PackageVersion="$(Version)"
                     WorkingDirectory="$(DotnetDebToolDir)" />

      <!-- Copy SDK package to output -->
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@ -22,9 +22,9 @@
    <NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
  </PropertyGroup>

-  <Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions;SetSdkVersionInfo;SetBuildDefaults">
+  <Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions;SetBuildDefaults">
    <PropertyGroup>
-      <SdkOutputDirectory>$(RedistLayoutPath)sdk\$(SdkVersion)\</SdkOutputDirectory>
+      <SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)\</SdkOutputDirectory>

      <InternalBuild Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">true</InternalBuild>
      <InternalBaseURL Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">https://dotnetclimsrc.blob.core.windows.net/dotnet/</InternalBaseURL>
@ -230,7 +230,7 @@
      <BundledLayoutComponent Include="ToolsetArchive">
        <BaseUrl>$(DotnetToolsetBlobRootUrl)Toolset/$(MicrosoftDotnetToolsetInternalPackageVersion)</BaseUrl>
        <DownloadFileName>dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip</DownloadFileName>
-        <RelativeLayoutPath>sdk/$(SdkVersion)</RelativeLayoutPath>
+        <RelativeLayoutPath>sdk/$(Version)</RelativeLayoutPath>
      </BundledLayoutComponent>
    </ItemGroup>

@ -405,7 +405,7 @@
      <ReplacementString>"version": "$(MicrosoftNETCoreAppRuntimePackageVersion)"</ReplacementString>
    </PropertyGroup>
    <ItemGroup>
-      <ToolRuntimeConfigPath Include="$(RedistLayoutPath)sdk/$(SdkVersion)/**/*.runtimeconfig.json" />
+      <ToolRuntimeConfigPath Include="$(RedistLayoutPath)sdk/$(Version)/**/*.runtimeconfig.json" />
    </ItemGroup>
    <ReplaceFileContents
      InputFiles="@(ToolRuntimeConfigPath)"
@ -414,9 +414,15 @@
      ReplacementStrings="$(ReplacementString)" />
  </Target>

-  <Target Name="GenerateVersionFile" DependsOnTargets="SetupBundledComponents;GetCoreSdkGitCommitInfo">
+  <Target Name="GenerateVersionFile" DependsOnTargets="SetupBundledComponents">
+    <Exec Command="git rev-parse HEAD"
+          ConsoleToMSBuild="true"
+          Condition=" '$(GitCommitHash)' == '' ">
+      <Output TaskParameter="ConsoleOutput" PropertyName="GitCommitHash" />
+    </Exec>
+
    <WriteLinesToFile File="$(SdkOutputDirectory).version"
-                      Lines="$(GitCommitHash);$(SdkVersion);$(Rid)"
+                      Lines="$(GitCommitHash);$(Version);$(Rid)"
                      Overwrite="true" />
  </Target>

@ -497,11 +503,11 @@

    <!-- Create "SDK Internal" layout to create the MSI to bundle -->
    <ItemGroup>
-      <SdkInternalFiles Include="$(RedistLayoutPath)sdk/$(SdkVersion)/**/*.*"/>
+      <SdkInternalFiles Include="$(RedistLayoutPath)sdk/$(Version)/**/*.*"/>
    </ItemGroup>

    <Copy SourceFiles="@(SdkInternalFiles)"
-          DestinationFiles="@(SdkInternalFiles -> '$(SdkInternalLayoutPath)sdk\$(SdkVersion)\%(RecursiveDir)%(Filename)%(Extension)')"/>
+          DestinationFiles="@(SdkInternalFiles -> '$(SdkInternalLayoutPath)sdk\$(Version)\%(RecursiveDir)%(Filename)%(Extension)')"/>

  </Target>
 </Project>
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@ -57,7 +57,7 @@
  </Target>

  <Target Name="MsiTargetsSetupInputOutputs"
-          DependsOnTargets="GenerateLayout;SetupWixProperties;GetCoreSdkGitCommitInfo">
+          DependsOnTargets="GenerateLayout;SetupWixProperties">
    <!-- Consumed By Publish -->
    <ItemGroup>
      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(Templates31MSIInstallerFile);$(Templates30MSIInstallerFile);$(Templates22MSIInstallerFile);$(Templates21MSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile);$(SdkPlaceholderMSIInstallerFile)" />
@ -144,7 +144,7 @@
                      '$(ToolsetBrandName)' ^
                      '$(MsiVersion)' ^
                      '$(SDKBundleVersion)' ^
-                      '$(NugetVersion)' ^
+                      '$(Version)' ^
                      '$(SdkInstallerUpgradeCode)' ^
                      '$(SdkDependencyKeyName)' ^
                      '$(Architecture)' ^
@ -164,7 +164,7 @@
                      '$(SdkBrandName)' ^
                      '$(MsiVersion)' ^
                      '$(SDKBundleVersion)' ^
-                      '$(NugetVersion)' ^
+                      '$(Version)' ^
                      '$(SdkPlaceholderInstallerUpgradeCode)' ^
                      '$(SdkPlaceholderDependencyKeyName)' ^
                      '$(Architecture)' ^
@ -264,7 +264,7 @@
                      '$(SdkBrandName)' ^
                      '$(MsiVersion)' ^
                      '$(SDKBundleVersion)' ^
-                      '$(NugetVersion)' ^
+                      '$(Version)' ^
                      '$(MicrosoftWindowsDesktopAppRuntimePackageVersion)' ^
                      '$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^
                      '$(SdkDependencyKeyName)' ^
--- a/src/redist/targets/GeneratePKG.targets
+++ b/src/redist/targets/GeneratePKG.targets
@ -1,7 +1,7 @@
 <Project>
-  <Target Name="SetupPKGProps" DependsOnTargets="SetSdkVersionInfo;GetCurrentRuntimeInformation;SetupFileExtensions">
+  <Target Name="SetupPKGProps" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions">
    <PropertyGroup>
-      <PkgIntermediateDirectory>$(IntermediateOutputPath)pkgs/$(SdkVersion)</PkgIntermediateDirectory>
+      <PkgIntermediateDirectory>$(IntermediateOutputPath)pkgs/$(Version)</PkgIntermediateDirectory>

      <!-- Properties for pkg build -->
      <SharedHostComponentId>com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.x64</SharedHostComponentId>
@ -10,8 +10,8 @@
      <NetCoreAppTargetingPackComponentId>com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppRefPackageVersion).component.osx.x64</NetCoreAppTargetingPackComponentId>
      <NetCoreAppHostPackComponentId>com.microsoft.dotnet.pack.apphost.$(MicrosoftNETCoreAppHostPackageVersion).component.osx.x64</NetCoreAppHostPackComponentId>
      <NetStandardTargetingPackComponentId>com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.x64</NetStandardTargetingPackComponentId>
-      <SdkComponentId>com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64</SdkComponentId>
-      <SdkProductArchiveId>com.microsoft.dotnet.dev.$(SdkVersion).osx.x64</SdkProductArchiveId>
+      <SdkComponentId>com.microsoft.dotnet.dev.$(Version).component.osx.x64</SdkComponentId>
+      <SdkProductArchiveId>com.microsoft.dotnet.dev.$(Version).osx.x64</SdkProductArchiveId>

      <PkgInstallDirectory>/usr/local/share/dotnet</PkgInstallDirectory>

@ -62,7 +62,7 @@
          <ReplacementString>$(SdkComponentId)</ReplacementString>
        </DistributionTemplateReplacement>
        <DistributionTemplateReplacement Include="{CLISdkNugetVersion}">
-          <ReplacementString>$(SdkVersion)</ReplacementString>
+          <ReplacementString>$(Version)</ReplacementString>
        </DistributionTemplateReplacement>
        <DistributionTemplateReplacement Include="{CLISdkBrandName}">
          <ReplacementString>$(SdkBrandName)</ReplacementString>
@ -87,11 +87,11 @@
        </DistributionTemplateReplacement>

        <PostInstallScriptReplacement Include="%SDK_VERSION%">
-          <ReplacementString>$(SdkVersion)</ReplacementString>
+          <ReplacementString>$(Version)</ReplacementString>
        </PostInstallScriptReplacement>

        <ResourcesReplacement Include="{DOTNETSDKVERSION}">
-          <ReplacementString>$(SdkVersion)</ReplacementString>
+          <ReplacementString>$(Version)</ReplacementString>
        </ResourcesReplacement>
        <ResourcesReplacement Include="{DOTNETRUNTIMEVERSION}">
          <ReplacementString>$(MicrosoftNETCoreAppRuntimePackageVersion)</ReplacementString>
@ -162,7 +162,7 @@
      <Exec Command="pkgbuild \
                     --root '$(SdkInternalLayoutPath)' \
                     --identifier '$(SdkComponentId)' \
-                     --version '$(SdkVersion)' \
+                     --version '$(Version)' \
                     --install-location '$(PkgInstallDirectory)' \
                     --scripts '$(SdkPkgDestinationScriptsDirectory)' \
                     '$(SdkPKGInstallerFile)'" />
@ -201,7 +201,7 @@
        ReplacementStrings="@(DistributionTemplateReplacement -> '%(ReplacementString)')" />

      <Exec Command="productbuild \
-                     --version '$(SdkVersion)' \
+                     --version '$(Version)' \
                     --identifier '$(SdkProductArchiveId)' \
                     --package-path '$(PkgIntermediateDirectory)' \
                     --resources '$(SdkProductArchiveResourcesDirectory)' \
--- a/src/redist/targets/GenerateRPMs.targets
+++ b/src/redist/targets/GenerateRPMs.targets
@ -111,7 +111,7 @@
        <ReplacementString>$(AspNetTargetingPackRpmPackageName)</ReplacementString>
      </SDKTokenValue>
      <SDKTokenValue Include="%SDK_NUGET_VERSION%">
-        <ReplacementString>$(SdkVersion)</ReplacementString>
+        <ReplacementString>$(Version)</ReplacementString>
      </SDKTokenValue>
      <SDKTokenValue Include="%CLI_SDK_BRAND_NAME%">
        <ReplacementString>$(SdkBrandName)</ReplacementString>
@ -121,7 +121,7 @@
      </SDKTokenValue>

      <AfterInstallHostTokenValue  Include="%SDK_VERSION%">
-        <ReplacementString>$(SdkVersion)</ReplacementString>
+        <ReplacementString>$(Version)</ReplacementString>
      </AfterInstallHostTokenValue>
    </ItemGroup>

@ -175,11 +175,11 @@
  </Target>

  <Target Name="SetupRpmProps"
-          DependsOnTargets="SetSdkVersionInfo;CalculateLinuxNativeInstallerDependencyVersions;GetCurrentRuntimeInformation;SetupFileExtensions">
+          DependsOnTargets="CalculateLinuxNativeInstallerDependencyVersions;GetCurrentRuntimeInformation;SetupFileExtensions">
    <PropertyGroup>
      <SdkRpmPackageVersion>$(MajorMinorVersion)</SdkRpmPackageVersion>
      <SdkRpmPackageName>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkRpmPackageVersion)</SdkRpmPackageName>
-      <RpmPackageVersion>$(SdkVersion)</RpmPackageVersion>
+      <RpmPackageVersion>$(Version)</RpmPackageVersion>
      <InputRoot>$(RedistLayoutPath)sdk/</InputRoot>
      <DotnetNewTemplatesRoot>$(RedistLayoutPath)templates/</DotnetNewTemplatesRoot>
      <SdkRPMInstallerFile>$(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkRPMInstallerFile>
--- a/src/redist/targets/GetRuntimeInformation.targets
+++ b/src/redist/targets/GetRuntimeInformation.targets
@ -1,5 +1,5 @@
 <Project>
-  <Target Name="GetCurrentRuntimeInformation" DependsOnTargets="SetSdkVersionInfo">
+  <Target Name="GetCurrentRuntimeInformation">
    <GetCurrentRuntimeInformation>
      <Output TaskParameter="Rid" PropertyName="HostRid" />
      <Output TaskParameter="OSName" PropertyName="HostOSName" />
@ -39,13 +39,13 @@
      <ArtifactNameSdk>dotnet-sdk-internal</ArtifactNameSdk>
      <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk</ArtifactNameCombinedHostHostFxrFrameworkSdk>

-      <ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
-      <ArtifactNameWithVersionMSBuildExtensions>dotnet-standard-support-vs2015-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionMSBuildExtensions>
-      <ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
+      <ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
+      <ArtifactNameWithVersionMSBuildExtensions>dotnet-standard-support-vs2015-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionMSBuildExtensions>
+      <ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
      <!-- Warning: changing the value "ProductBandCombinedHostHostFxrFrameworkSdkName" can only occur on a product-band boundary [CliProductBandVersion], 
               Changing "ProductBandCombinedHostHostFxrFrameworkSdkName" mid-product-band will break the upgradablilty of the SDK bundle installer. -->
      <ProductBandCombinedHostHostFxrFrameworkSdkName>Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid)</ProductBandCombinedHostHostFxrFrameworkSdkName>
-      <DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdkWithoutHostMonikerRid>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdkWithoutHostMonikerRid>
+      <DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdkWithoutHostMonikerRid>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdkWithoutHostMonikerRid>
      <DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdkWithoutHostMonikerRid)$(HostMonikerRidForFileName)</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
    </PropertyGroup>
  </Target>
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@ -1,55 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <VersionMajor>5</VersionMajor>
-    <VersionMinor>0</VersionMinor>
-    <VersionSDKMinor>1</VersionSDKMinor>
-    <VersionPatch>00</VersionPatch>
-    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">alpha1</ReleaseSuffix>
-    <!--
-        When DropSuffix is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-    -->
-    <DropSuffix>false</DropSuffix>
-  </PropertyGroup>
-  
-  <Target Name="GetCoreSdkGitCommitInfo">
-    <Exec Command="git rev-list --count HEAD"
-          ConsoleToMSBuild="true"
-          Condition=" '$(GitCommitCount)' == '' ">
-      <Output TaskParameter="ConsoleOutput" PropertyName="GitCommitCount" />
-    </Exec>
-
-    <Exec Command="git rev-parse HEAD"
-          ConsoleToMSBuild="true"
-          Condition=" '$(GitCommitHash)' == '' ">
-      <Output TaskParameter="ConsoleOutput" PropertyName="GitCommitHash" />
-    </Exec>
-
-    <PropertyGroup>
-      <GitCommitCount>$(GitCommitCount.PadLeft(6,'0'))</GitCommitCount>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="SetSdkVersionInfo" DependsOnTargets="GetCoreSdkGitCommitInfo">
-    <PropertyGroup>
-      <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
-      <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
-      <CliVersionNoSuffix>$(CliProductBandVersion)$(VersionPatch)</CliVersionNoSuffix>
-      <CliVersionPrefix>$(CliVersionNoSuffix)-$(ReleaseSuffix)</CliVersionPrefix>
-      <CliBrandingVersion Condition=" '$(DropSuffix)' != 'true' ">$(CliVersionNoSuffix) - $(ReleaseSuffix)</CliBrandingVersion>
-      <CliBrandingVersion Condition=" '$(DropSuffix)' == 'true' ">$(CliVersionNoSuffix)</CliBrandingVersion>
-      <SDKBundleVersion>$(CliVersionNoSuffix).$(GitCommitCount)</SDKBundleVersion>
-
-      <VersionSuffix Condition=" '$(DropSuffix)' != 'true' ">$(ReleaseSuffix)-$(GitCommitCount)</VersionSuffix>
-
-      <FullNugetVersion>$(CliVersionNoSuffix)-$(ReleaseSuffix)-$(GitCommitCount)</FullNugetVersion>
-
-      <NugetVersion Condition=" '$(DropSuffix)' != 'true' ">$(FullNugetVersion)</NugetVersion>
-      <NugetVersion Condition=" '$(NugetVersion)' == '' ">$(CliVersionNoSuffix)</NugetVersion>
-
-      <SdkVersion>$(NugetVersion)</SdkVersion>
-      <SdkNugetVersion>$(NugetVersion)</SdkNugetVersion>
-
-    </PropertyGroup>
-  </Target>
-  
-</Project>