From a279af52d25149e99ddda2892e993a36fe1d06c5 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 10 Jul 2019 20:12:41 -0700 Subject: [PATCH] Make native sln builds opt in rather than always on (#12050) --- Directory.Build.props | 2 +- src/Servers/IIS/build/assets.props | 315 +++++++++++++++-------------- 2 files changed, 159 insertions(+), 158 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index fd98445b41..d7c5acd6b0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -151,7 +151,7 @@ $(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.targets - true + true $(ArtifactsObjDir)TargetingPack.Layout\$(Configuration)\ diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props index 4015e2338c..e6f289883b 100644 --- a/src/Servers/IIS/build/assets.props +++ b/src/Servers/IIS/build/assets.props @@ -1,6 +1,7 @@ + true true false x64 @@ -10,215 +11,215 @@ - $(ArtifactsBinDir)AspNetCoreModuleShim\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2.dll - $(ArtifactsBinDir)InProcessRequestHandler\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2_inprocess.dll + $(ArtifactsBinDir)AspNetCoreModuleShim\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2.dll + $(ArtifactsBinDir)InProcessRequestHandler\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2_inprocess.dll $(ArtifactsBinDir)OutOfProcessRequestHandler\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2_outofprocess.dll