diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 4db1d90864a9..df4f5766c36f 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -417,6 +417,7 @@ stages:
--all
--no-build-nodejs
--no-build-java
+ --binarylog
-p:OnlyPackPlatformSpecificPackages=true
-p:AssetManifestFileName=aspnetcore-MacOS_arm64.xml
$(_BuildArgs)
@@ -447,6 +448,7 @@ stages:
--all
--no-build-nodejs
--no-build-java
+ --binarylog
-p:OnlyPackPlatformSpecificPackages=true
-p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
$(_BuildArgs)
@@ -481,6 +483,7 @@ stages:
--all
--no-build-nodejs
--no-build-java
+ --binarylog
-p:OnlyPackPlatformSpecificPackages=true
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
@@ -525,6 +528,7 @@ stages:
--all
--no-build-nodejs
--no-build-java
+ --binarylog
-p:OnlyPackPlatformSpecificPackages=true
-p:AssetManifestFileName=aspnetcore-Linux_arm.xml
$(_BuildArgs)
@@ -558,6 +562,7 @@ stages:
--all
--no-build-nodejs
--no-build-java
+ --binarylog
-p:OnlyPackPlatformSpecificPackages=true
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
@@ -598,6 +603,7 @@ stages:
--all
--no-build-nodejs
--no-build-java
+ --binarylog
-p:OnlyPackPlatformSpecificPackages=true
-p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
$(_BuildArgs)
@@ -633,6 +639,7 @@ stages:
--all
--no-build-nodejs
--no-build-java
+ --binarylog
-p:OnlyPackPlatformSpecificPackages=true
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml
$(_BuildArgs)
@@ -667,6 +674,7 @@ stages:
--all
--no-build-nodejs
--no-build-java
+ --binarylog
-p:OnlyPackPlatformSpecificPackages=true
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
$(_BuildArgs)
diff --git a/Directory.Build.props b/Directory.Build.props
index 1230281ba953..d79b636c698c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -174,6 +174,8 @@
freebsd-x64
+ $(SupportedRuntimeIdentifiers);$(TargetRuntimeIdentifier)
+
false
true
diff --git a/eng/Common.props b/eng/Common.props
index a9a69bde9f22..3dcca1c6b54d 100644
--- a/eng/Common.props
+++ b/eng/Common.props
@@ -6,6 +6,8 @@
freebsd
x64
$(TargetOsName)-$(TargetArchitecture)
+ true
+ $(TargetRuntimeIdentifier)
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index c1b35e485328..0d47cc0a111b 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -106,6 +106,7 @@ and are generated based on the last package release.
+
@@ -121,6 +122,7 @@ and are generated based on the last package release.
+
diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in
index 3da7ea2b44d3..30e25d4e68a5 100644
--- a/eng/tools/GenerateFiles/Directory.Build.targets.in
+++ b/eng/tools/GenerateFiles/Directory.Build.targets.in
@@ -56,18 +56,27 @@
${MicrosoftNETCoreAppRuntimeVersion}
+ $(TargetRuntimeIdentifier)
${MicrosoftNETCoreAppRuntimeVersion}
+ $(TargetRuntimeIdentifier)
${MicrosoftNETCoreAppRuntimeVersion}
+ $(TargetRuntimeIdentifier)
+
+ ${MicrosoftNETCoreAppRuntimeVersion}
+ $(TargetRuntimeIdentifier)
+
+
false
true
- linux-x64
+ linux-x64
annotations
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 bf90848a34bd..efb1d7eccf1b 100644
--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
@@ -96,7 +96,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
$(Crossgen2ToolFileName).exe
- PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier)
+ PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_'))
$(TargetOsName)
linux
+ $(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-'))))
x64
$(BuildArchitecture)
- PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName)-$(Crossgen2BuildArchitecture)
+ PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName.Replace('.', '_'))-$(Crossgen2BuildArchitecture)
$(AssetTargetFallback);native,Version=0.0
diff --git a/src/Tools/Directory.Build.targets b/src/Tools/Directory.Build.targets
index 854f90ab5c20..438ea3da045d 100644
--- a/src/Tools/Directory.Build.targets
+++ b/src/Tools/Directory.Build.targets
@@ -1,7 +1,7 @@
- win-x64;win-x86
+ win-x64;win-x86
false