Ensure the deb/rpm installers use the same dotnet-core version

- Remove unnecessary tasks and scripts
 - Ensure the KOREBUILD_DOTNET_* environment variables are preserved in the docker build context
 - Other MSBuild cleanup of the targets

build/PackageArchive.targets

@@ -4,7 +4,7 @@
     <_WorkRoot>$(RepositoryRoot).w\</_WorkRoot>
   </PropertyGroup>
 
-  <Target Name="_BuildFallbackArchive" DependsOnTargets="ResolveRepoInfo;_ResolveCurrentSharedFrameworkVersion">
+  <Target Name="_BuildFallbackArchive" DependsOnTargets="ResolveRepoInfo">
     <Error Text="DotNetRestoreSources must be specified" Condition=" '$(DotNetRestoreSources)' == '' " />
     <Error Text="OutputPackageName must be specified" Condition=" '$(OutputPackageName)' == '' " />
     <Error Text="ArchiverPath must be specified" Condition=" '$(ArchiverPath)' == '' " />
@@ -37,7 +37,7 @@
     <MSBuild
       Projects="$(_WorkRoot)Archive.csproj"
       Targets="Restore"
-      Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(SharedFrameworkVersion);DotNetRestoreSources=$(DotNetRestoreSources);AspNetUniverseBuildOffline=true" />
+      Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion);DotNetRestoreSources=$(DotNetRestoreSources);AspNetUniverseBuildOffline=true" />
 
     <!-- Create the archive -->
     <Exec Command="$(ArchiverPath) -a $(FallbackOutputArchive) $(FallbackStagingDir)" />

build/RuntimeStore.targets

@@ -122,7 +122,7 @@
     </PropertyGroup>
   </Target>
 
-  <Target Name="BuildRuntimeStore" DependsOnTargets="_ResolveCurrentSharedFrameworkVersion;_ResolveRuntimeStoreRID;_PrepareRuntimeStoreBuildAssets;BuildRSReferencesPackage">
+  <Target Name="BuildRuntimeStore" DependsOnTargets="_ResolveRuntimeStoreRID;_PrepareRuntimeStoreBuildAssets;BuildRSReferencesPackage">
     <!-- Copy and update build assets -->
     <Copy SourceFiles="$(_TemplatesDirectory)RS.Manifest\RS.Manifest.csproj" DestinationFiles="$(_WorkRoot)RS.Manifest\RS.Manifest.csproj" />
     <Copy SourceFiles="$(_SrcDirectory)Directory.Build.props" DestinationFolder="$(_WorkRoot)" />
@@ -133,7 +133,7 @@
       <_ComposeStoreProps>$(_ComposeStoreProps);ComposeDir=$(_RuntimeStoreOutputDirectory)</_ComposeStoreProps>
       <_ComposeStoreProps>$(_ComposeStoreProps);ComposeWorkingDir=$(_RuntimeStoreWorkDirectory)</_ComposeStoreProps>
       <_ComposeStoreProps>$(_ComposeStoreProps);RuntimeIdentifier=$(RuntimeStoreRID)</_ComposeStoreProps>
-      <_ComposeStoreProps>$(_ComposeStoreProps);RuntimeFrameworkVersion=$(SharedFrameworkVersion)</_ComposeStoreProps>
+      <_ComposeStoreProps>$(_ComposeStoreProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion)</_ComposeStoreProps>
     </PropertyGroup>
 
     <!-- Build runtime store -->
@@ -142,17 +142,7 @@
              Properties="$(_ComposeStoreProps)" />
   </Target>
 
-  <Target Name="_ResolveCurrentSharedFrameworkVersion">
+  <Target Name="BuildHostingDeps" DependsOnTargets="ResolveRepoInfo">
-    <!-- Parse framework version -->
-    <Exec Command="powershell.exe $(_BuildScriptsDirectory)GetSharedFrameworkVersion.ps1" ConsoleToMSBuild="true" StandardOutputImportance="Normal" Condition="'$(OS)' == 'Windows_NT'">
-      <Output TaskParameter="ConsoleOutput" PropertyName="SharedFrameworkVersion" />
-    </Exec>
-    <Exec Command="bash $(_BuildScriptsDirectory)GetSharedFrameworkVersion.sh" ConsoleToMSBuild="true" StandardOutputImportance="Normal" Condition="'$(OS)' != 'Windows_NT'">
-      <Output TaskParameter="ConsoleOutput" PropertyName="SharedFrameworkVersion" />
-    </Exec>
-  </Target>
-
-  <Target Name="BuildHostingDeps" DependsOnTargets="ResolveRepoInfo;_ResolveCurrentSharedFrameworkVersion">
     <!-- Generate RS.Reference project -->
     <RepoTasks.ResolveHostingStartupPackages
       BuildArtifacts="@(ArtifactInfo)"
@@ -163,7 +153,7 @@
     <!--- MSBuild caches things if you run inproc so have to use Exec -->
     <MSBuild Projects="$(_TemplatesDirectory)HostingStartup/HostingStartup.csproj"
              Targets="Restore;Rebuild;CollectDeps"
-             Properties="DepsOutputPath=$(_DepsOutputDirectory);HostingStartupPackageName=%(HostingStartupArtifacts.PackageId);HostingStartupPackageVersion=%(HostingStartupArtifacts.Version);RuntimeFrameworkVersion=$(SharedFrameworkVersion)" />
+             Properties="DepsOutputPath=$(_DepsOutputDirectory);HostingStartupPackageName=%(HostingStartupArtifacts.PackageId);HostingStartupPackageVersion=%(HostingStartupArtifacts.Version);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion)" />
 
     <ItemGroup>
       <DepsFiles Include="$(_DepsOutputDirectory)**\*.deps.json" />

build/RuntimeStoreInstaller.targets

@@ -16,57 +16,43 @@
     <HostingInstallerName>dotnet-hosting</HostingInstallerName>
     <RSDebConfigFile>$(_PackagingDir)store_debian_config.json</RSDebConfigFile>
     <HostingDebConfigFile>$(_PackagingDir)hosting_debian_config.json</HostingDebConfigFile>
+
+    <CoreFeedPrefix Condition="'$(KOREBUILD_DOTNET_FEED_UNCACHED)'!=''">$(KOREBUILD_DOTNET_FEED_UNCACHED)</CoreFeedPrefix>
+    <CoreFeedPrefix Condition="'$(CoreFeedPrefix)'==''">https://dotnetcli.blob.core.windows.net/dotnet</CoreFeedPrefix>
   </PropertyGroup>
 
   <Target Name="BuildInstallers" DependsOnTargets="GenerateTargzs;GenerateRpms;GenerateDebs" />
 
-  <Target Name="_EnsureInstallerPrerequisites" DependsOnTargets="_ResolveCurrentSharedFrameworkVersion">
+  <Target Name="_EnsureInstallerPrerequisites">
     <!-- Check Docker server OS -->
-    <Exec Command="docker version -f &quot;{{.Server.Os}}&quot;" ConsoleToMSBuild="true">
+    <Exec Command="docker version -f &quot;{{.Server.Os}}&quot;" StandardOutputImportance="Normal" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="DockerHostOS" />
     </Exec>
 
     <Error Text="Docker host must be using Linux containers." Condition="'$(DockerHostOS)' != 'linux'"/>
 
-    <!-- Generate timestamp free version -->
-    <RepoTasks.GetTimestampFreeVersion
-      TimestampVersion="$(Version)">
-      <Output TaskParameter="TimestampFreeVersion" ItemName="_TimestampFreeVersion" />
-    </RepoTasks.GetTimestampFreeVersion>
-
     <PropertyGroup>
-      <CoreFeedPrefix Condition="'CoreFeedPrefix'==''">http://dotnetcli.azureedge.net</CoreFeedPrefix>
+      <RuntimeTargzLink>$(CoreFeedPrefix)/dotnet/Runtime/$(MicrosoftNETCoreApp20PackageVersion)/dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz</RuntimeTargzLink>
-      <RuntimeTargzLink>$(CoreFeedPrefix)/dotnet/Runtime/$(SharedFrameworkVersion)/dotnet-runtime-$(SharedFrameworkVersion)-linux-x64.tar.gz</RuntimeTargzLink>
+      <RuntimeTargzLink Condition="'$(KOREBUILD_DOTNET_FEED_CREDENTIAL)' != ''">$(RuntimeTargzLink)$(KOREBUILD_DOTNET_FEED_CREDENTIAL)</RuntimeTargzLink>
     </PropertyGroup>
 
-    <!-- Save properties for future use -->
     <PropertyGroup>
-      <TimestampFreeVersion>@(_TimestampFreeVersion)</TimestampFreeVersion>
+      <TimestampRSArchive>$(_TimestampRSSource)aspnetcore-store-$(PackageVersion)-linux-x64.tar.gz</TimestampRSArchive>
+      <TimestampFreeRSArchive>$(_TimestampFreeRSSource)aspnetcore-store-$(PackageVersionNoTimestamp)-linux-x64.tar.gz</TimestampFreeRSArchive>
     </PropertyGroup>
 
-    <ItemGroup>
-      <_TimestampRSArchive Include="$(_TimestampRSSource)aspnetcore-store-$(Version)-linux-x64.tar.gz"/>
-      <_TimestampFreeRSArchive Include="$(_TimestampFreeRSSource)aspnetcore-store-$(TimestampFreeVersion)-linux-x64.tar.gz"/>
-    </ItemGroup>
-
     <Error
-      Text="@(_TimestampRSArchive->Count()) timestamp linux archives found." 
+      Text="Timestamp linux archive not found. Expected it to exist in $(TimestampRSArchive)."
-      Condition="'@(_TimestampRSArchive->Count())' != 1 Or !Exists('@(_TimestampRSArchive)')" />
+      Condition="!Exists('$(TimestampRSArchive)')" />
     <Error
-      Text="@(_TimestampFreeRSArchive->Count()) no timestamp linux archives found." 
+      Text="Non-timestamp linux archive not found. Expected it to exist in $(TimestampFreeRSArchive)."
-      Condition="'@(_TimestampFreeRSArchive->Count())' != 1 Or !Exists('@(_TimestampRSArchive)')" />
+      Condition="!Exists('$(TimestampFreeRSArchive)')" />
-
-    <!-- Save properties for future use -->
-    <PropertyGroup>
-      <TimestampRSArchive>@(_TimestampRSArchive)</TimestampRSArchive>
-      <TimestampFreeRSArchive>@(_TimestampFreeRSArchive)</TimestampFreeRSArchive>
-    </PropertyGroup>
   </Target>
 
   <Target Name="_DownloadCoreInstallers">
     <!-- Download dotnet installers -->
     <MakeDir Directories="$(_CoreInstallerSource)" />
-    <Exec Command="curl &quot;$(RuntimeTargzLink)$(CoreFeedSuffix)&quot; -o $(_CoreInstallerSource)dotnet-runtime-$(SharedFrameworkVersion)-linux-x64.tar.gz" />
+    <Exec Command="curl &quot;$(RuntimeTargzLink)&quot; -o $(_CoreInstallerSource)dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz" />
   </Target>
 
   <Target Name="_GenerateTargz">
@@ -83,14 +69,10 @@
   </Target>
 
   <Target Name="GenerateTargzs" DependsOnTargets="_EnsureInstallerPrerequisites;_DownloadCoreInstallers">
-    <ItemGroup>
-      <_RuntimeArchive Include="$(_CoreInstallerSource)dotnet-runtime-$(SharedFrameworkVersion)-linux-x64.tar.gz" />
-    </ItemGroup>
-
     <PropertyGroup>
-      <RuntimeArchive>@(_RuntimeArchive)</RuntimeArchive>
+      <RuntimeArchive>$(_CoreInstallerSource)dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz</RuntimeArchive>
       <HostingArchiveName>$(HostingInstallerName)-$(Version)-linux-x64.tar.gz</HostingArchiveName>
-      <TimestampFreeHostingArchiveName>$(HostingInstallerName)-$(TimestampFreeVersion)-linux-x64.tar.gz</TimestampFreeHostingArchiveName>
+      <TimestampFreeHostingArchiveName>$(HostingInstallerName)-$(PackageVersionNoTimestamp)-linux-x64.tar.gz</TimestampFreeHostingArchiveName>
     </PropertyGroup>
 
     <!-- Timestamp hosting bundle -->
@@ -151,6 +133,11 @@
     <Exec Command="docker run
       --rm
       -v $(RepositoryRoot):$(_DockerRootDirectory)
+      -e 'KOREBUILD_DOTNET_VERSION=$(KOREBUILD_DOTNET_VERSION)'
+      -e 'KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION=$(KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION)'
+      -e 'KOREBUILD_DOTNET_FEED_CDN=$(KOREBUILD_DOTNET_FEED_CDN)'
+      -e 'KOREBUILD_DOTNET_FEED_UNCACHED=$(KOREBUILD_DOTNET_FEED_UNCACHED)'
+      -e 'KOREBUILD_DOTNET_FEED_CREDENTIAL=$(KOREBUILD_DOTNET_FEED_CREDENTIAL)'
       docker-image-$(Image)
       fpm
         --verbose
@@ -232,17 +219,17 @@
       <RHStoreDirectories Include="$(RHInstallerInstallRoot)store" />
       <GenericStoreDirectories Include="$(GenericInstallerInstallRoot)additionalDeps" />
       <GenericStoreDirectories Include="$(GenericInstallerInstallRoot)store" />
-      <HostingDependencies Include="$(RSInstallerName)-$(Version)">
+      <HostingDependencies Include="$(RSInstallerName)-$(PackageVersion)">
-        <Version>$(Version)</Version>
+        <Version>$(PackageVersion)</Version>
       </HostingDependencies>
-      <HostingDependencies Include="dotnet-runtime-$(SharedFrameworkVersion)">
+      <HostingDependencies Include="dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)">
-        <Version>$(SharedFrameworkVersion)</Version>
+        <Version>$(MicrosoftNETCoreApp20PackageVersion)</Version>
       </HostingDependencies>
-      <TimestampFreeHostingDependencies Include="$(RSInstallerName)-$(TimestampFreeVersion)">
+      <TimestampFreeHostingDependencies Include="$(RSInstallerName)-$(PackageVersionNoTimestamp)">
-        <Version>$(TimestampFreeVersion)</Version>
+        <Version>$(PackageVersionNoTimestamp)</Version>
       </TimestampFreeHostingDependencies>
-      <TimestampFreeHostingDependencies Include="dotnet-runtime-$(SharedFrameworkVersion)">
+      <TimestampFreeHostingDependencies Include="dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)">
-        <Version>$(SharedFrameworkVersion)</Version>
+        <Version>$(MicrosoftNETCoreApp20PackageVersion)</Version>
       </TimestampFreeHostingDependencies>
     </ItemGroup>
 
@@ -267,28 +254,28 @@
       <CommonHostingArguments>$(CommonHostingArguments);RPMLicense=@(_HostingLicense);RPMHomepage=@(_HostingHomepage)</CommonHostingArguments>
 
       <TimestampRSArguments>$(CommonArguments);$(CommonGenericArguments);$(CommonRSArguments)</TimestampRSArguments>
-      <TimestampRSArguments>$(TimestampRSArguments);RSArchive=$(TimestampRSArchive);RPMVersion=$(Version);RPMArguments=$(GenericRSArguments)</TimestampRSArguments>
+      <TimestampRSArguments>$(TimestampRSArguments);RSArchive=$(TimestampRSArchive);RPMVersion=$(PackageVersion);RPMArguments=$(GenericRSArguments)</TimestampRSArguments>
 
       <TimestampFreeRSArguments>$(CommonArguments);$(CommonGenericArguments);$(CommonRSArguments)</TimestampFreeRSArguments>
-      <TimestampFreeRSArguments>$(TimestampFreeRSArguments);RSArchive=$(TimestampFreeRSArchive);RPMVersion=$(TimestampFreeVersion);RPMArguments=$(GenericRSArguments)</TimestampFreeRSArguments>
+      <TimestampFreeRSArguments>$(TimestampFreeRSArguments);RSArchive=$(TimestampFreeRSArchive);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(GenericRSArguments)</TimestampFreeRSArguments>
 
       <TimestampHostingArguments>$(CommonArguments);$(CommonGenericArguments);$(CommonHostingArguments)</TimestampHostingArguments>
-      <TimestampHostingArguments>$(TimestampHostingArguments);RPMVersion=$(Version);RPMArguments=$(HostingArguments)</TimestampHostingArguments>
+      <TimestampHostingArguments>$(TimestampHostingArguments);RPMVersion=$(PackageVersion);RPMArguments=$(HostingArguments)</TimestampHostingArguments>
 
       <TimestampFreeHostingArguments>$(CommonArguments);$(CommonGenericArguments);$(CommonHostingArguments)</TimestampFreeHostingArguments>
-      <TimestampFreeHostingArguments>$(TimestampFreeHostingArguments);RPMVersion=$(TimestampFreeVersion);RPMArguments=$(TimestampFreeHostingFPMArguments)</TimestampFreeHostingArguments>
+      <TimestampFreeHostingArguments>$(TimestampFreeHostingArguments);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(TimestampFreeHostingFPMArguments)</TimestampFreeHostingArguments>
 
       <RHTimestampRSArguments>$(CommonArguments);$(CommonRHArguments);$(CommonRSArguments)</RHTimestampRSArguments>
-      <RHTimestampRSArguments>$(RHTimestampRSArguments);RSArchive=$(TimestampRSArchive);RPMVersion=$(Version);RPMArguments=$(RHRSArguments)</RHTimestampRSArguments>
+      <RHTimestampRSArguments>$(RHTimestampRSArguments);RSArchive=$(TimestampRSArchive);RPMVersion=$(PackageVersion);RPMArguments=$(RHRSArguments)</RHTimestampRSArguments>
 
       <RHTimestampFreeRSArguments>$(CommonArguments);$(CommonRHArguments);$(CommonRSArguments)</RHTimestampFreeRSArguments>
-      <RHTimestampFreeRSArguments>$(RHTimestampFreeRSArguments);RSArchive=$(TimestampFreeRSArchive);RPMVersion=$(TimestampFreeVersion);RPMArguments=$(RHRSArguments)</RHTimestampFreeRSArguments>
+      <RHTimestampFreeRSArguments>$(RHTimestampFreeRSArguments);RSArchive=$(TimestampFreeRSArchive);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(RHRSArguments)</RHTimestampFreeRSArguments>
 
       <RHTimestampHostingArguments>$(CommonArguments);$(CommonRHArguments);$(CommonHostingArguments)</RHTimestampHostingArguments>
-      <RHTimestampHostingArguments>$(RHTimestampHostingArguments);RPMVersion=$(Version);RPMArguments=$(HostingArguments)</RHTimestampHostingArguments>
+      <RHTimestampHostingArguments>$(RHTimestampHostingArguments);RPMVersion=$(PackageVersion);RPMArguments=$(HostingArguments)</RHTimestampHostingArguments>
 
       <RHTimestampFreeHostingArguments>$(CommonArguments);$(CommonRHArguments);$(CommonHostingArguments)</RHTimestampFreeHostingArguments>
-      <RHTimestampFreeHostingArguments>$(RHTimestampFreeHostingArguments);RPMVersion=$(TimestampFreeVersion);RPMArguments=$(TimestampFreeHostingFPMArguments)</RHTimestampFreeHostingArguments>
+      <RHTimestampFreeHostingArguments>$(RHTimestampFreeHostingArguments);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(TimestampFreeHostingFPMArguments)</RHTimestampFreeHostingArguments>
     </PropertyGroup>
 
     <!-- General Timestamp runtime store -->
@@ -345,6 +332,11 @@
       -e DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
       -e INSTALLER_NAME=$(DebPrefix)-$(DebVersion)
       -e INSTALLER_VERSION=$(DebVersion)
+      -e 'KOREBUILD_DOTNET_VERSION=$(KOREBUILD_DOTNET_VERSION)'
+      -e 'KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION=$(KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION)'
+      -e 'KOREBUILD_DOTNET_FEED_CDN=$(KOREBUILD_DOTNET_FEED_CDN)'
+      -e 'KOREBUILD_DOTNET_FEED_UNCACHED=$(KOREBUILD_DOTNET_FEED_UNCACHED)'
+      -e 'KOREBUILD_DOTNET_FEED_CREDENTIAL=$(KOREBUILD_DOTNET_FEED_CREDENTIAL)'
       docker-image-$(Image)
       ./build.sh /t:RunDebTool"
       ContinueOnError="WarnAndContinue" />
@@ -367,7 +359,7 @@
   <Target Name="_GenerateDebOnPlatform">
     <PropertyGroup>
       <CommonRSArguments>Image=$(Image);DebConfig=$(RSDebConfigFile);DebPrefix=$(RSInstallerName)</CommonRSArguments>
-      <CommonHostingArguments>Image=$(Image);DebConfig=$(HostingDebConfigFile);DotnetVersion=$(SharedFrameworkVersion);DebPrefix=$(HostingInstallerName)</CommonHostingArguments>
+      <CommonHostingArguments>Image=$(Image);DebConfig=$(HostingDebConfigFile);DotnetVersion=$(MicrosoftNETCoreApp20PackageVersion);DebPrefix=$(HostingInstallerName)</CommonHostingArguments>
     </PropertyGroup>
 
     <!-- Build Docker Image -->
@@ -380,7 +372,7 @@
     <MSBuild
       Projects="$(MSBuildProjectFullPath)"
       Targets="_GenerateDeb"
-      Properties="$(CommonRSArguments);RSArchive=$(TimestampFreeRSArchive);DebVersion=$(TimestampFreeVersion)" />
+      Properties="$(CommonRSArguments);RSArchive=$(TimestampFreeRSArchive);DebVersion=$(PackageVersionNoTimestamp)" />
     <MSBuild
       Projects="$(MSBuildProjectFullPath)"
       Targets="_GenerateDeb"
@@ -388,7 +380,7 @@
     <MSBuild
       Projects="$(MSBuildProjectFullPath)"
       Targets="_GenerateDeb"
-      Properties="$(CommonHostingArguments);DebVersion=$(TimestampFreeVersion)" />
+      Properties="$(CommonHostingArguments);DebVersion=$(PackageVersionNoTimestamp)" />
 
     <!-- Remove Docker Image to save disk space -->
     <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_RemoveDockerImage" Properties="Image=$(Image)" />
@@ -396,7 +388,7 @@
 
   <Target Name="GenerateDebs" DependsOnTargets="_EnsureInstallerPrerequisites">
     <PropertyGroup>
-      <CommonArguments>Version=$(Version);TimestampFreeVersion=$(TimestampFreeVersion)</CommonArguments>
+      <CommonArguments>Version=$(Version);TimestampFreeVersion=$(PackageVersionNoTimestamp)</CommonArguments>
     </PropertyGroup>
 
     <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_GenerateDebOnPlatform" Properties="$(CommonArguments);Image=debian.8" />

build/dependencies.props

@@ -30,6 +30,7 @@
     <DotNetCoreFeed>https://dotnet.myget.org/F/dotnet-core/api/v3/index.json</DotNetCoreFeed>
     <CoreSetupPackageVersion>2.0.2-servicing-25728-02</CoreSetupPackageVersion>
     <MicrosoftNETCorePlatformsPackageVersion>2.0.0</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCoreApp20PackageVersion>$(CoreSetupPackageVersion)</MicrosoftNETCoreApp20PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

build/tasks/GetTimestampFreeVersion.cs

@@ -1,26 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Linq;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using RepoTasks.Utilities;
-
-namespace RepoTasks
-{
-    public class GetTimestampFreeVersion : Task
-    {
-        [Required]
-        public string TimestampVersion { get; set; }
-
-        [Output]
-        public string TimestampFreeVersion { get; set; }
-
-        public override bool Execute()
-        {
-            TimestampFreeVersion = VersionUtilities.GetTimestampFreeVersion(TimestampVersion);
-
-            return true;
-        }
-    }
-}

build/tasks/RepoTasks.tasks

@@ -17,6 +17,5 @@
   <UsingTask TaskName="RepoTasks.CreateCommonManifest" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.ComposeNewStore" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.ConsolidateManifests" AssemblyFile="$(_RepoTaskAssembly)" />
-  <UsingTask TaskName="RepoTasks.GetTimestampFreeVersion" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.ReplaceInFile" AssemblyFile="$(_RepoTaskAssembly)" />
 </Project>

build/tools/scripts/GetSharedFrameworkVersion.ps1

@@ -1,6 +0,0 @@
-$infoOutput = dotnet --info
-$versions = $infoOutput | Select-String -Pattern "version"
-$FXVersionRaw = $versions | Select-Object -Last 1
-$FXVersionString = $FXVersionRaw.ToString()
-$FXVersion = $FXVersionString.SubString($FXVersionString.IndexOf(':') + 1).Trim()
-Write-Host $FXVersion

build/tools/scripts/GetSharedFrameworkVersion.sh

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-dotnet --info | grep -i version | tail -1 | cut -f 2 -d ":" | tr -d ' '

src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj

@@ -19,7 +19,7 @@
     <PackageTags>aspnetcore</PackageTags>
     <Description>Microsoft.AspNetCore.All</Description>
     <EnableApiCheck>false</EnableApiCheck>
-    <RuntimeFrameworkVersion>$(CoreSetupPackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>