diff --git a/Directory.Build.props b/Directory.Build.props
index a4302a035b87..c105182abce0 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -220,7 +220,7 @@
$(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.targets
<_MvcTestingTasksAssembly>$(ArtifactsBinDir)\Microsoft.AspNetCore.Mvc.Testing.Tasks\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.Tasks.dll
- true
+ true
$(ArtifactsObjDir)TargetingPack.Layout\$(Configuration)\
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 d9865271c407..5bc7822cd656 100644
--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
@@ -137,7 +137,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
PrivateAssets="All"
GeneratePathProperty="true" />
-
Platform=$(NativePlatform)
@@ -148,7 +148,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
Build;GetTargetPath
- <_ResolvedNativeProjectReferencePaths Condition=" '$(BuildIisNativeProjects)' == 'true' AND !$(BuildNative) "
+ <_ResolvedNativeProjectReferencePaths Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll">
true
@@ -233,7 +233,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Symbols/Microsoft.AspNetCore.ANCMSymbols.csproj b/src/Servers/IIS/AspNetCoreModuleV2/Symbols/Microsoft.AspNetCore.ANCMSymbols.csproj
index 6462d799ed80..184b5a6bd6b1 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/Symbols/Microsoft.AspNetCore.ANCMSymbols.csproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/Symbols/Microsoft.AspNetCore.ANCMSymbols.csproj
@@ -27,7 +27,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
diff --git a/src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj b/src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj
index 9bc04ec25ea6..19ea680c8222 100644
--- a/src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj
+++ b/src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
index cd2a0398e4c4..a471e574485c 100644
--- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
@@ -30,10 +30,10 @@
+ Condition="'$(UseIisNativeAssets)' == 'true' AND !Exists('$(AspNetCoreModuleV2InProcessHandlerDll)')" />
-
+
diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
index 773666cfd700..ba228fad3e98 100644
--- a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
+++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
@@ -28,12 +28,12 @@
-
+
-
+
@@ -44,13 +44,13 @@
-
+
-
+
diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props
index 0b42276a1203..4c96daef952d 100644
--- a/src/Servers/IIS/build/assets.props
+++ b/src/Servers/IIS/build/assets.props
@@ -1,9 +1,9 @@
- true
- true
- false
+ true
+ true
+ false
x64
$(TargetArchitecture)
Win32
diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props
index e688d56e5b8f..8b761db0027b 100644
--- a/src/Servers/IIS/build/testsite.props
+++ b/src/Servers/IIS/build/testsite.props
@@ -63,7 +63,7 @@
the end of processes using the GenerateBuildDependencyFile target.
-->
@@ -76,7 +76,7 @@
(GenerateSingleFileBundle also uses the intermediate .desp file but only in single-file publish cases ignored here.)
-->
diff --git a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 b/src/Servers/IIS/tools/GenerateNativeAssets.ps1
index 86324c6096ba..b71e17ddebf0 100644
--- a/src/Servers/IIS/tools/GenerateNativeAssets.ps1
+++ b/src/Servers/IIS/tools/GenerateNativeAssets.ps1
@@ -128,7 +128,7 @@ $content = @"
- true
+ true
x64
`$(Platform)
Win32