diff --git a/build/SharedFx.props b/build/SharedFx.props index 3e9c4cb65e..edabfea8c3 100644 --- a/build/SharedFx.props +++ b/build/SharedFx.props @@ -29,11 +29,11 @@ $(PublicCoreFeedPrefix) dotnet-runtime - $(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21PackageVersion) - $(DotnetRuntimeInstallerName)-linux-x64.tar.gz - $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreApp21PackageVersion)/$(DotnetRuntimeInstallerArchiveName) - - $(_SharedFxSourceDir)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion)-linux-x64.tar.gz + $(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21PackageVersion) + $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreApp21PackageVersion)/$(DotnetRuntimeInstallerPrefix) + $(DotNetAssetRootUrl)aspnetcore/store/2.0.3-125/ + Build.RS + $(_SharedFxSourceDir)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion) Microsoft @@ -45,4 +45,10 @@ Microsoft ASP.NET Core $(PackageVersion) Shared Framework Shared Framework for hosting of Microsoft ASP.NET Core applications. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/aspnet/home). We happily accept issues and PRs. + + + + + + diff --git a/build/SharedFx.targets b/build/SharedFx.targets index d29fe48b0d..eb0e738b2d 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -37,12 +37,8 @@ - - <_AcceptableSharedFxRIDs Include="win-x64;win-x86;osx-x64;linux-x64"/> - - - true + true diff --git a/build/SharedFxInstaller.targets b/build/SharedFxInstaller.targets index 76f77cb94b..760846bf2f 100644 --- a/build/SharedFxInstaller.targets +++ b/build/SharedFxInstaller.targets @@ -1,5 +1,5 @@ - + @@ -9,19 +9,47 @@ - - + + + - + + + + + + + + - + - $(SharedFxInstallerName)-$(PackageVersion)-linux-x64.tar.gz + .tar.gz + .zip + .winx64.zip + .winx86.zip + .osx.tar.gz + .linux.tar.gz @@ -29,11 +57,48 @@ - - + + + + + + + + - - + + + + + + + + + + + @@ -102,7 +167,7 @@ - + @@ -116,7 +181,7 @@ $(RpmCommonArguments);RpmMaintainerName=$(MaintainerName);RpmMaintainerEmail=$(MaintainerEmail) $(RpmCommonArguments);RpmHomepage=$(Homepage);RpmRevision=$(PackageRevision) $(RpmCommonArguments);RpmLicense=$(LicenseType) - $(RpmCommonArguments);RpmInstallerPrefix=$(SharedFxInstallerName);SharedFxArchive=$(SharedFxLinuxIntermediateArchiveFilePath) + $(RpmCommonArguments);RpmInstallerPrefix=$(SharedFxInstallerName);SharedFxArchive=$(SharedFxIntermediateArchiveFilePrefix)-linux-x64.tar.gz $(RpmCommonArguments);RpmMSummary=$(SharedFxSummary);RpmDescription=$(SharedFxDescription) RpmFileSuffix=rhel.7-x64.rpm;RpmInstallRoot=$(InstallRoot) RpmFileSuffix=rh.rhel.7-x64.rpm;RpmInstallRoot=$(RHInstallRoot) @@ -204,7 +269,7 @@ <_DebSharedFxDependencies Include="aspnetcore-store-2.0.3"/> - <_DebSharedFxDependencies Include="$(DotnetRuntimeInstallerName)"/> + <_DebSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)"/> @@ -212,7 +277,7 @@ Image=$(Image);DebVersion=$(Version) DebPrefix=$(SharedFxInstallerName);DebSummary=$(SharedFxSummary);DebDescription=$(SharedFxDescription) - $(DebSharedFxProps);DebDependencies=$(DebSharedFxDependencies);SharedFxArchive=$(SharedFxLinuxIntermediateArchiveFilePath) + $(DebSharedFxProps);DebDependencies=$(DebSharedFxDependencies);SharedFxArchive=$(SharedFxIntermediateArchiveFilePrefix)-linux-x64.tar.gz