diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index 0465a73e55..8ec8c5aa2a 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -4,7 +4,7 @@ <_WorkRoot>$(RepositoryRoot).w\ - + @@ -37,7 +37,7 @@ + Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion);DotNetRestoreSources=$(DotNetRestoreSources);AspNetUniverseBuildOffline=true" /> diff --git a/build/RuntimeStore.targets b/build/RuntimeStore.targets index 483499044c..c369b30a0a 100644 --- a/build/RuntimeStore.targets +++ b/build/RuntimeStore.targets @@ -122,7 +122,7 @@ - + @@ -133,7 +133,7 @@ <_ComposeStoreProps>$(_ComposeStoreProps);ComposeDir=$(_RuntimeStoreOutputDirectory) <_ComposeStoreProps>$(_ComposeStoreProps);ComposeWorkingDir=$(_RuntimeStoreWorkDirectory) <_ComposeStoreProps>$(_ComposeStoreProps);RuntimeIdentifier=$(RuntimeStoreRID) - <_ComposeStoreProps>$(_ComposeStoreProps);RuntimeFrameworkVersion=$(SharedFrameworkVersion) + <_ComposeStoreProps>$(_ComposeStoreProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion) @@ -142,17 +142,7 @@ Properties="$(_ComposeStoreProps)" /> - - - - - - - - - - - + + Properties="DepsOutputPath=$(_DepsOutputDirectory);HostingStartupPackageName=%(HostingStartupArtifacts.PackageId);HostingStartupPackageVersion=%(HostingStartupArtifacts.Version);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion)" /> diff --git a/build/RuntimeStoreInstaller.targets b/build/RuntimeStoreInstaller.targets index 32672d2760..3159278722 100644 --- a/build/RuntimeStoreInstaller.targets +++ b/build/RuntimeStoreInstaller.targets @@ -16,57 +16,43 @@ dotnet-hosting $(_PackagingDir)store_debian_config.json $(_PackagingDir)hosting_debian_config.json + + $(KOREBUILD_DOTNET_FEED_UNCACHED) + https://dotnetcli.blob.core.windows.net/dotnet - + - + - - - - - - http://dotnetcli.azureedge.net - $(CoreFeedPrefix)/dotnet/Runtime/$(SharedFrameworkVersion)/dotnet-runtime-$(SharedFrameworkVersion)-linux-x64.tar.gz - - - - - @(_TimestampFreeVersion) + $(CoreFeedPrefix)/dotnet/Runtime/$(MicrosoftNETCoreApp20PackageVersion)/dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz + $(RuntimeTargzLink)$(KOREBUILD_DOTNET_FEED_CREDENTIAL) - - <_TimestampRSArchive Include="$(_TimestampRSSource)aspnetcore-store-$(Version)-linux-x64.tar.gz"/> - <_TimestampFreeRSArchive Include="$(_TimestampFreeRSSource)aspnetcore-store-$(TimestampFreeVersion)-linux-x64.tar.gz"/> - - - - - - - @(_TimestampRSArchive) - @(_TimestampFreeRSArchive) + $(_TimestampRSSource)aspnetcore-store-$(PackageVersion)-linux-x64.tar.gz + $(_TimestampFreeRSSource)aspnetcore-store-$(PackageVersionNoTimestamp)-linux-x64.tar.gz + + + - + @@ -83,14 +69,10 @@ - - <_RuntimeArchive Include="$(_CoreInstallerSource)dotnet-runtime-$(SharedFrameworkVersion)-linux-x64.tar.gz" /> - - - @(_RuntimeArchive) + $(_CoreInstallerSource)dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz $(HostingInstallerName)-$(Version)-linux-x64.tar.gz - $(HostingInstallerName)-$(TimestampFreeVersion)-linux-x64.tar.gz + $(HostingInstallerName)-$(PackageVersionNoTimestamp)-linux-x64.tar.gz @@ -151,6 +133,11 @@ @@ -232,17 +219,17 @@ - - $(Version) + + $(PackageVersion) - - $(SharedFrameworkVersion) + + $(MicrosoftNETCoreApp20PackageVersion) - - $(TimestampFreeVersion) + + $(PackageVersionNoTimestamp) - - $(SharedFrameworkVersion) + + $(MicrosoftNETCoreApp20PackageVersion) @@ -251,7 +238,7 @@ @(TimestampFreeHostingDependencies->' -d "%(Identity) >= %(Version)"', ' ') @(RHStoreDirectories->' --directories "%(FullPath)"', ' ') @(GenericStoreDirectories->' --directories "%(FullPath)"', ' ') - + Image=$(Image);RPMVendor=$(RPMVendor) RPMFileSuffix=rhel.7-x64.rpm;RPMInstallRoot=$(GenericInstallerInstallRoot) RPMFileSuffix=rhel.rh.7-x64.rpm;RPMInstallRoot=$(RHInstallerInstallRoot) @@ -260,35 +247,35 @@ $(CommonRSArguments);RPMInstallerPrefix=$(RSInstallerName);RPMRevision=@(_RSPackageRevision) $(CommonRSArguments);RPMSummary=@(_RSInstallerSummary);RPMDescription=@(_RSDescription) $(CommonRSArguments);RPMLicense=@(_RSLicense);RPMHomepage=@(_RSHomepage) - + $(CommonArguments);MaintainerName=@(_HostingMaintainerName);MaintainerEmail=@(_HostingMaintainerEmail) $(CommonHostingArguments);RPMInstallerPrefix=$(HostingInstallerName);RPMRevision=@(_HostingRevision) $(CommonHostingArguments);RPMSummary=@(_HostingSummary);RPMDescription=@(_HostingDescription) $(CommonHostingArguments);RPMLicense=@(_HostingLicense);RPMHomepage=@(_HostingHomepage) $(CommonArguments);$(CommonGenericArguments);$(CommonRSArguments) - $(TimestampRSArguments);RSArchive=$(TimestampRSArchive);RPMVersion=$(Version);RPMArguments=$(GenericRSArguments) - + $(TimestampRSArguments);RSArchive=$(TimestampRSArchive);RPMVersion=$(PackageVersion);RPMArguments=$(GenericRSArguments) + $(CommonArguments);$(CommonGenericArguments);$(CommonRSArguments) - $(TimestampFreeRSArguments);RSArchive=$(TimestampFreeRSArchive);RPMVersion=$(TimestampFreeVersion);RPMArguments=$(GenericRSArguments) - + $(TimestampFreeRSArguments);RSArchive=$(TimestampFreeRSArchive);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(GenericRSArguments) + $(CommonArguments);$(CommonGenericArguments);$(CommonHostingArguments) - $(TimestampHostingArguments);RPMVersion=$(Version);RPMArguments=$(HostingArguments) - + $(TimestampHostingArguments);RPMVersion=$(PackageVersion);RPMArguments=$(HostingArguments) + $(CommonArguments);$(CommonGenericArguments);$(CommonHostingArguments) - $(TimestampFreeHostingArguments);RPMVersion=$(TimestampFreeVersion);RPMArguments=$(TimestampFreeHostingFPMArguments) + $(TimestampFreeHostingArguments);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(TimestampFreeHostingFPMArguments) $(CommonArguments);$(CommonRHArguments);$(CommonRSArguments) - $(RHTimestampRSArguments);RSArchive=$(TimestampRSArchive);RPMVersion=$(Version);RPMArguments=$(RHRSArguments) - + $(RHTimestampRSArguments);RSArchive=$(TimestampRSArchive);RPMVersion=$(PackageVersion);RPMArguments=$(RHRSArguments) + $(CommonArguments);$(CommonRHArguments);$(CommonRSArguments) - $(RHTimestampFreeRSArguments);RSArchive=$(TimestampFreeRSArchive);RPMVersion=$(TimestampFreeVersion);RPMArguments=$(RHRSArguments) - + $(RHTimestampFreeRSArguments);RSArchive=$(TimestampFreeRSArchive);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(RHRSArguments) + $(CommonArguments);$(CommonRHArguments);$(CommonHostingArguments) - $(RHTimestampHostingArguments);RPMVersion=$(Version);RPMArguments=$(HostingArguments) - + $(RHTimestampHostingArguments);RPMVersion=$(PackageVersion);RPMArguments=$(HostingArguments) + $(CommonArguments);$(CommonRHArguments);$(CommonHostingArguments) - $(RHTimestampFreeHostingArguments);RPMVersion=$(TimestampFreeVersion);RPMArguments=$(TimestampFreeHostingFPMArguments) + $(RHTimestampFreeHostingArguments);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(TimestampFreeHostingFPMArguments) @@ -299,7 +286,7 @@ - + @@ -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" /> @@ -353,9 +345,9 @@ - + - + Image=$(Image);DebConfig=$(RSDebConfigFile);DebPrefix=$(RSInstallerName) - Image=$(Image);DebConfig=$(HostingDebConfigFile);DotnetVersion=$(SharedFrameworkVersion);DebPrefix=$(HostingInstallerName) + Image=$(Image);DebConfig=$(HostingDebConfigFile);DotnetVersion=$(MicrosoftNETCoreApp20PackageVersion);DebPrefix=$(HostingInstallerName) - + - - - + - - + + - Version=$(Version);TimestampFreeVersion=$(TimestampFreeVersion) + Version=$(Version);TimestampFreeVersion=$(PackageVersionNoTimestamp) - - - - + + + + @@ -410,7 +402,7 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index 4700a67867..b58e80713a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -30,6 +30,7 @@ https://dotnet.myget.org/F/dotnet-core/api/v3/index.json 2.0.2-servicing-25728-02 2.0.0 + $(CoreSetupPackageVersion) diff --git a/build/tasks/GetTimestampFreeVersion.cs b/build/tasks/GetTimestampFreeVersion.cs deleted file mode 100644 index f1df5bc439..0000000000 --- a/build/tasks/GetTimestampFreeVersion.cs +++ /dev/null @@ -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; - } - } -} diff --git a/build/tasks/RepoTasks.tasks b/build/tasks/RepoTasks.tasks index e03bdc266a..5410effb57 100644 --- a/build/tasks/RepoTasks.tasks +++ b/build/tasks/RepoTasks.tasks @@ -17,6 +17,5 @@ - diff --git a/build/tools/scripts/GetSharedFrameworkVersion.ps1 b/build/tools/scripts/GetSharedFrameworkVersion.ps1 deleted file mode 100644 index 37772625fe..0000000000 --- a/build/tools/scripts/GetSharedFrameworkVersion.ps1 +++ /dev/null @@ -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 diff --git a/build/tools/scripts/GetSharedFrameworkVersion.sh b/build/tools/scripts/GetSharedFrameworkVersion.sh deleted file mode 100755 index dee9ea2db8..0000000000 --- a/build/tools/scripts/GetSharedFrameworkVersion.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -dotnet --info | grep -i version | tail -1 | cut -f 2 -d ":" | tr -d ' ' \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj index d7155f1cc3..c3d5b59912 100644 --- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj +++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj @@ -19,7 +19,7 @@ aspnetcore Microsoft.AspNetCore.All false - $(CoreSetupPackageVersion) + $(MicrosoftNETCoreApp20PackageVersion)