diff --git a/eng/Build.props b/eng/Build.props
index 75292f7dd962..01e1c53eded6 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -83,8 +83,10 @@
+
+
Platform=x86
$(DotNetBuildPass)
@@ -92,6 +94,10 @@
$(DotNetBuildPass)
+
+
+ $(DotNetBuildPass)
+
diff --git a/eng/Common.props b/eng/Common.props
index 925b967e12ca..986f0273079d 100644
--- a/eng/Common.props
+++ b/eng/Common.props
@@ -31,4 +31,10 @@
false
+
+
+
+
+ false
+
diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
index f3b42389f2cb..f28d8d8d5d6d 100644
--- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
+++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
@@ -18,6 +18,7 @@
true
true
false
+ $(ArtifactsObjDir)SiteExtensionsReferenceLayout/
$(RestoreAdditionalProjectSources);$(ArtifactsNonShippingPackagesDir)
@@ -38,15 +39,44 @@
UpdateLatestPackageReferences for the hard way.
-->
+
+ <_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64.$(PackageVersion).nupkg"
+ Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64"
+ Condition=" '$(IsShipping)' == 'false' AND '$(DotNetBuild)' == 'true'" />
+ <_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86.$(PackageVersion).nupkg"
+ Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86"
+ Condition=" '$(IsShipping)' == 'false' AND '$(DotNetBuild)' == 'true'" />
+
+
+
+
+
+
+
+
@@ -68,14 +98,14 @@
-->
+ Condition=" '$(IsShipping)' == 'true'">
-
+
@@ -83,9 +113,22 @@
PrivateAssets="All"
Version="%(_ResolvedPackageVersionInfo.PackageVersion)" />
+
+
+ <_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
+ Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64" />
+ <_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
+ Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86" />
+
+
+
+ Exclude="$(NugetPackageRoot)\Microsoft.AspNetCore.AzureAppServices.SiteExtension.*.x86\**\Microsoft.AspNetCore.AzureAppServices.HostingStartup.deps.json" />
+
+
-
-
+
\ No newline at end of file
diff --git a/src/SiteExtensions/LoggingBranch/LB.csproj b/src/SiteExtensions/LoggingBranch/LB.csproj
index 68b1439ef2b6..09810fa61d3a 100644
--- a/src/SiteExtensions/LoggingBranch/LB.csproj
+++ b/src/SiteExtensions/LoggingBranch/LB.csproj
@@ -24,10 +24,12 @@
+
+ SkipGetTargetFrameworkProperties="true"
+ Condition="'$(DotNetBuildPass)' != '2'" />
@@ -42,4 +44,6 @@
+
+
diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
index e204031389b5..d117ac1fa9f5 100644
--- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
+++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
@@ -34,10 +34,12 @@
SkipGetTargetFrameworkProperties="true" />
+
+ SkipGetTargetFrameworkProperties="true"
+ Condition="'$(DotNetBuildPass)' != '2'" />
@@ -56,5 +58,6 @@
+