From a54646f9a5807842c0afbcb576809f8171281c15 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Fri, 12 Apr 2019 16:28:19 -0700 Subject: [PATCH] Use default VC toolset (#9332) --- .../AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj | 3 +++ .../IIS-Setup/IIS-Common/lib/CommonLib.vcxproj | 3 +++ .../AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj | 3 +++ .../IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj | 3 +++ src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj | 3 +++ .../AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj | 3 +++ src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 3 +++ .../InProcessRequestHandler/InProcessRequestHandler.vcxproj | 3 +++ .../OutOfProcessRequestHandler.vcxproj | 3 +++ .../RequestHandlerLib/RequestHandlerLib.vcxproj | 3 +++ src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj | 3 +++ src/Servers/IIS/build/Build.Settings | 2 +- 12 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index 8aafdde3c1..da7c3b16b4 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -48,6 +48,9 @@ true + + + $(IIS-Common)version;$(IIS-Common)Include;$(IIS-Setup)iisca\lib;$(WIX)sdk\$(WixPlatformToolset)\inc;$(AdditionalIncludeDirectories) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj index 3eaa339620..92295eb9db 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj @@ -41,6 +41,9 @@ $(ProjectDir)..\include;$(IncludePath) iiscommon + + + true diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj index b1b76b9b08..a75af0850a 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj @@ -77,6 +77,9 @@ v141 + + + $(IIS-Common)version;$(IIS-Common)Include;$(AdditionalIncludeDirectories) Create diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index eff3e6d1b9..5a75024208 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -28,6 +28,9 @@ 10.0.17134.0 + + + DynamicLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index b73d0978ad..9fd8d24671 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -26,6 +26,9 @@ 10.0.17134.0 + + + StaticLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 1c4e1520f0..3c76ed6b05 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -26,6 +26,9 @@ Unicode + + + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 04b9d13c0d..2afc56dacb 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -26,6 +26,9 @@ 10.0.17134.0 + + + StaticLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 91a0290afc..cf2b5d1f02 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -28,6 +28,9 @@ InProcessRequestHandler + + + DynamicLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index f303165e9e..29428de6a2 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -28,6 +28,9 @@ OutOfProcessRequestHandler + + + DynamicLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index d74177acc3..56088b84ad 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -26,6 +26,9 @@ 10.0.17134.0 + + + StaticLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj index f184f229f1..20bc6451a1 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj @@ -29,6 +29,9 @@ 10.0.17134.0 + + + StaticLibrary true diff --git a/src/Servers/IIS/build/Build.Settings b/src/Servers/IIS/build/Build.Settings index ce1d870e75..0097cb4352 100644 --- a/src/Servers/IIS/build/Build.Settings +++ b/src/Servers/IIS/build/Build.Settings @@ -4,7 +4,7 @@ $(MSBuildThisFileDirectory)..\ Debug Win32 - v141 + v142 $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ $(OutputPath) aspnetcore