diff --git a/build/RuntimeStoreInstaller.targets b/build/RuntimeStoreInstaller.targets
index a4c1690d66..0868fa6dee 100644
--- a/build/RuntimeStoreInstaller.targets
+++ b/build/RuntimeStoreInstaller.targets
@@ -22,10 +22,11 @@
$(KOREBUILD_DOTNET_FEED_UNCACHED)
$(PublicCoreFeedPrefix)
- $(PublicCoreFeedPrefix)/aspnetcore/store/2.0.0-26452/Build.RS.linux.tar.gz
+ $(PublicCoreFeedPrefix)/aspnetcore/store/2.0.0-26452/Build.RS.
$(CoreFeedPrefix)/Runtime/$(MicrosoftNETCoreApp20PackageVersion)/dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz
$(_TimestampRSSource)aspnetcore-store-$(PackageVersion)-linux-x64.tar.gz
- $(_TimestampFreeRSSource)aspnetcore-store-$(PackageVersionNoTimestamp)-linux-x64.tar.gz
+ $(_TimestampFreeRSSource)aspnetcore-store-$(PackageVersionNoTimestamp)-
+ $(TimestampFreeRSArchivePrefix)linux-x64.tar.gz
@@ -44,11 +45,25 @@
Text="Timestamp linux archive not found. Expected it to exist in $(TimestampRSArchive)."
Condition="!Exists('$(TimestampRSArchive)')" />
+ Text="Non-timestamp linux archive not found. Expected it to exist in $(TimestampFreeLinuxRSArchive)."
+ Condition="!Exists('$(TimestampFreeLinuxRSArchive)')" />
+
+
+
-
+
+
+
+
+
+
-
+
@@ -78,6 +93,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<_DependentArchives Include="$(_InstallerSource)dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz" />
@@ -99,7 +136,43 @@
+ Properties="DependentArchives=$(DependentArchives);RSArchive=$(TimestampFreeLinuxRSArchive);HostingArchiveName=$(TimestampFreeHostingArchiveName)" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(TimestampFreeRSArchivePrefix)linux-x64.tar.gz
+
+
+ $(TimestampFreeRSArchivePrefix)osx-x64.tar.gz
+
+
+ $(TimestampFreeRSArchivePrefix)win7-x64.zip
+
+
+ $(TimestampFreeRSArchivePrefix)win7-x86.zip
+
+
+
+
+
+
+
@@ -273,7 +346,7 @@
$(TimestampRSArguments);RSArchive=$(TimestampRSArchive);RPMVersion=$(PackageVersion);RPMArguments=$(GenericRSArguments)
$(CommonArguments);$(CommonGenericArguments);$(CommonRSArguments)
- $(TimestampFreeRSArguments);RSArchive=$(TimestampFreeRSArchive);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(GenericRSArguments)
+ $(TimestampFreeRSArguments);RSArchive=$(TimestampFreeLinuxRSArchive);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(GenericRSArguments)
$(CommonArguments);$(CommonGenericArguments);$(CommonHostingArguments)
$(TimestampHostingArguments);RPMVersion=$(PackageVersion);RPMArguments=$(HostingFPMArguments)
@@ -285,7 +358,7 @@
$(RHTimestampRSArguments);RSArchive=$(TimestampRSArchive);RPMVersion=$(PackageVersion);RPMArguments=$(RHRSArguments)
$(CommonArguments);$(CommonRHArguments);$(CommonRSArguments)
- $(RHTimestampFreeRSArguments);RSArchive=$(TimestampFreeRSArchive);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(RHRSArguments)
+ $(RHTimestampFreeRSArguments);RSArchive=$(TimestampFreeLinuxRSArchive);RPMVersion=$(PackageVersionNoTimestamp);RPMArguments=$(RHRSArguments)
$(CommonArguments);$(CommonRHArguments);$(CommonHostingArguments)
$(RHTimestampHostingArguments);RPMVersion=$(PackageVersion);RPMArguments=$(HostingFPMArguments)
@@ -395,7 +468,7 @@
+ Properties="$(CommonRSArguments);RSArchive=$(TimestampFreeLinuxRSArchive);DebVersion=$(PackageVersionNoTimestamp)" />