diff --git a/Directory.Build.props b/Directory.Build.props index c1ce790ad1a9..49b7b757a3f8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -242,6 +242,37 @@ .zip + + https://dotnetcli.azureedge.net/dotnet/ + + https://dotnetbuilds.azureedge.net/public/ + https://dotnetbuilds.azureedge.net/internal/ + + $(InstallersOutputPath) + + + + + + + + + $(DotnetRuntimeSourceFeedKey) + + + + + + + + + + true diff --git a/eng/Build.props b/eng/Build.props index 57f53a3ce17b..b6a70dfd94ee 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -71,7 +71,13 @@ - + + <_BuildWindowsInstallers Condition="'$(BuildInstallers)' == 'true' AND '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">true + <_WixTargetPlatform Condition="'$(TargetArchitecture)' == 'x86' ">Win32 + <_WixTargetPlatform Condition="'$(TargetArchitecture)' == 'x64' ">x64 + <_WixTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64' ">ARM64 + + @@ -103,7 +109,26 @@ - + + + + + + + + + + + + + + + + + + + + diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index 48725d72139d..4907647519ee 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -556,16 +556,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant Targets related to creating .zip/.tar.gz ######################################### --> - - + - - - - $(DotnetRuntimeSourceFeedKey) - + - + + <_CurrentRemoteAsset>%(RemoteAsset.Identity) + - - - - $(DotnetRuntimeSourceFeedKey) - + - + x64 SharedFxRedistInstallerx64 $(SharedFxPackageVersion) - + x86 SharedFxRedistInstallerx86 $(SharedFxPackageVersion) - + arm64 SharedFxRedistInstallerarm64 $(SharedFxPackageVersion)