Skip to content

Commit 149aa61

Browse files
jkotalikjkotalik
committed
nits
1 parent 468dcde commit 149aa61

File tree

11 files changed

+51
-10
lines changed

11 files changed

+51
-10
lines changed

‎src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,30 @@
3333
<UseDebugLibraries>true</UseDebugLibraries>
3434
<PlatformToolset>v142</PlatformToolset>
3535
<CharacterSet>Unicode</CharacterSet>
36+
<VCToolsVersion />
3637
</PropertyGroup>
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3839
<ConfigurationType>DynamicLibrary</ConfigurationType>
3940
<UseDebugLibraries>true</UseDebugLibraries>
4041
<PlatformToolset>v142</PlatformToolset>
4142
<CharacterSet>Unicode</CharacterSet>
43+
<VCToolsVersion />
4244
</PropertyGroup>
4345
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4446
<ConfigurationType>DynamicLibrary</ConfigurationType>
4547
<UseDebugLibraries>false</UseDebugLibraries>
4648
<PlatformToolset>v142</PlatformToolset>
4749
<WholeProgramOptimization>true</WholeProgramOptimization>
4850
<CharacterSet>Unicode</CharacterSet>
51+
<VCToolsVersion />
4952
</PropertyGroup>
5053
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5154
<ConfigurationType>DynamicLibrary</ConfigurationType>
5255
<UseDebugLibraries>false</UseDebugLibraries>
5356
<PlatformToolset>v142</PlatformToolset>
5457
<WholeProgramOptimization>true</WholeProgramOptimization>
5558
<CharacterSet>Unicode</CharacterSet>
59+
<VCToolsVersion />
5660
</PropertyGroup>
5761
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5862
<Import Project="..\..\build\Build.Settings" />

‎src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,30 @@
3131
<UseDebugLibraries>true</UseDebugLibraries>
3232
<PlatformToolset>v142</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
34+
<VCToolsVersion />
3435
</PropertyGroup>
3536
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3637
<ConfigurationType>StaticLibrary</ConfigurationType>
3738
<UseDebugLibraries>false</UseDebugLibraries>
3839
<PlatformToolset>v142</PlatformToolset>
3940
<WholeProgramOptimization>true</WholeProgramOptimization>
4041
<CharacterSet>Unicode</CharacterSet>
42+
<VCToolsVersion />
4143
</PropertyGroup>
4244
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4345
<ConfigurationType>StaticLibrary</ConfigurationType>
4446
<UseDebugLibraries>true</UseDebugLibraries>
4547
<PlatformToolset>v142</PlatformToolset>
4648
<CharacterSet>Unicode</CharacterSet>
49+
<VCToolsVersion />
4750
</PropertyGroup>
4851
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4952
<ConfigurationType>StaticLibrary</ConfigurationType>
5053
<UseDebugLibraries>false</UseDebugLibraries>
5154
<PlatformToolset>v142</PlatformToolset>
5255
<WholeProgramOptimization>false</WholeProgramOptimization>
5356
<CharacterSet>Unicode</CharacterSet>
57+
<VCToolsVersion />
5458
</PropertyGroup>
5559
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5660
<ImportGroup Label="ExtensionSettings">

‎src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@
2626
<CharacterSet>Unicode</CharacterSet>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
29+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
30+
<VCToolsVersion />
31+
</PropertyGroup>
32+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
33+
<VCToolsVersion />
34+
</PropertyGroup>
35+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
36+
<VCToolsVersion />
37+
</PropertyGroup>
38+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
39+
<VCToolsVersion />
40+
</PropertyGroup>
2941
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3042
<ImportGroup Label="ExtensionSettings" />
3143
<ImportGroup Label="Shared" />

‎src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,30 @@
3131
<UseDebugLibraries>true</UseDebugLibraries>
3232
<PlatformToolset>v142</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
34+
<VCToolsVersion />
3435
</PropertyGroup>
3536
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3637
<ConfigurationType>StaticLibrary</ConfigurationType>
3738
<UseDebugLibraries>true</UseDebugLibraries>
3839
<PlatformToolset>v142</PlatformToolset>
3940
<CharacterSet>Unicode</CharacterSet>
41+
<VCToolsVersion />
4042
</PropertyGroup>
4143
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4244
<ConfigurationType>StaticLibrary</ConfigurationType>
4345
<UseDebugLibraries>false</UseDebugLibraries>
4446
<PlatformToolset>v142</PlatformToolset>
4547
<WholeProgramOptimization>true</WholeProgramOptimization>
4648
<CharacterSet>Unicode</CharacterSet>
49+
<VCToolsVersion />
4750
</PropertyGroup>
4851
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4952
<ConfigurationType>StaticLibrary</ConfigurationType>
5053
<UseDebugLibraries>false</UseDebugLibraries>
5154
<PlatformToolset>v142</PlatformToolset>
5255
<WholeProgramOptimization>true</WholeProgramOptimization>
5356
<CharacterSet>Unicode</CharacterSet>
57+
<VCToolsVersion />
5458
</PropertyGroup>
5559
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5660
<ImportGroup Label="ExtensionSettings">

‎src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,30 @@
3333
<UseDebugLibraries>true</UseDebugLibraries>
3434
<PlatformToolset>v142</PlatformToolset>
3535
<CharacterSet>Unicode</CharacterSet>
36+
<VCToolsVersion />
3637
</PropertyGroup>
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3839
<ConfigurationType>DynamicLibrary</ConfigurationType>
3940
<UseDebugLibraries>false</UseDebugLibraries>
4041
<PlatformToolset>v142</PlatformToolset>
4142
<WholeProgramOptimization>true</WholeProgramOptimization>
4243
<CharacterSet>Unicode</CharacterSet>
44+
<VCToolsVersion />
4345
</PropertyGroup>
4446
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4547
<ConfigurationType>DynamicLibrary</ConfigurationType>
4648
<UseDebugLibraries>true</UseDebugLibraries>
4749
<PlatformToolset>v142</PlatformToolset>
4850
<CharacterSet>Unicode</CharacterSet>
51+
<VCToolsVersion />
4952
</PropertyGroup>
5053
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5154
<ConfigurationType>DynamicLibrary</ConfigurationType>
5255
<UseDebugLibraries>false</UseDebugLibraries>
5356
<PlatformToolset>v142</PlatformToolset>
5457
<WholeProgramOptimization>true</WholeProgramOptimization>
5558
<CharacterSet>Unicode</CharacterSet>
59+
<VCToolsVersion />
5660
</PropertyGroup>
5761
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5862
<ImportGroup Label="ExtensionSettings">

‎src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication()
239239
// We could hack it so we check if the dll exists before and after setting the current directory
240240
// But the best solution would be to be able to set a specific assembly name rather than full path
241241
// See: https://github.com/dotnet/core-setup/issues/5556
242-
auto startupHookDll = Environment::GetCurrentDirectoryValue() + std::wstring(L"\\Microsoft.AspNetCore.Server.IIS.dll");
242+
auto startupHookDll = std::wstring(L"Microsoft.AspNetCore.Server.IIS");
243243

244244
SetEnvironmentVariable(L"DOTNET_STARTUP_HOOKS", startupHookDll.c_str());
245245

‎src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,30 @@
3333
<UseDebugLibraries>true</UseDebugLibraries>
3434
<PlatformToolset>v142</PlatformToolset>
3535
<CharacterSet>Unicode</CharacterSet>
36+
<VCToolsVersion />
3637
</PropertyGroup>
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3839
<ConfigurationType>DynamicLibrary</ConfigurationType>
3940
<UseDebugLibraries>false</UseDebugLibraries>
4041
<PlatformToolset>v142</PlatformToolset>
4142
<WholeProgramOptimization>true</WholeProgramOptimization>
4243
<CharacterSet>Unicode</CharacterSet>
44+
<VCToolsVersion />
4345
</PropertyGroup>
4446
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4547
<ConfigurationType>DynamicLibrary</ConfigurationType>
4648
<UseDebugLibraries>true</UseDebugLibraries>
4749
<PlatformToolset>v142</PlatformToolset>
4850
<CharacterSet>Unicode</CharacterSet>
51+
<VCToolsVersion />
4952
</PropertyGroup>
5053
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5154
<ConfigurationType>DynamicLibrary</ConfigurationType>
5255
<UseDebugLibraries>false</UseDebugLibraries>
5356
<PlatformToolset>v142</PlatformToolset>
5457
<WholeProgramOptimization>true</WholeProgramOptimization>
5558
<CharacterSet>Unicode</CharacterSet>
59+
<VCToolsVersion />
5660
</PropertyGroup>
5761
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5862
<ImportGroup Label="ExtensionSettings">

‎src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,30 @@
3131
<UseDebugLibraries>true</UseDebugLibraries>
3232
<PlatformToolset>v142</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
34+
<VCToolsVersion />
3435
</PropertyGroup>
3536
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3637
<ConfigurationType>StaticLibrary</ConfigurationType>
3738
<UseDebugLibraries>false</UseDebugLibraries>
3839
<PlatformToolset>v142</PlatformToolset>
3940
<WholeProgramOptimization>true</WholeProgramOptimization>
4041
<CharacterSet>Unicode</CharacterSet>
42+
<VCToolsVersion />
4143
</PropertyGroup>
4244
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4345
<ConfigurationType>StaticLibrary</ConfigurationType>
4446
<UseDebugLibraries>true</UseDebugLibraries>
4547
<PlatformToolset>v142</PlatformToolset>
4648
<CharacterSet>Unicode</CharacterSet>
49+
<VCToolsVersion />
4750
</PropertyGroup>
4851
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4952
<ConfigurationType>StaticLibrary</ConfigurationType>
5053
<UseDebugLibraries>false</UseDebugLibraries>
5154
<PlatformToolset>v142</PlatformToolset>
5255
<WholeProgramOptimization>false</WholeProgramOptimization>
5356
<CharacterSet>Unicode</CharacterSet>
57+
<VCToolsVersion />
5458
</PropertyGroup>
5559
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5660
<ImportGroup Label="ExtensionSettings">

‎src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<PlatformToolset>v142</PlatformToolset>
3636
<CharacterSet>Unicode</CharacterSet>
3737
<TargetName>gtestd</TargetName>
38+
<VCToolsVersion />
3839
</PropertyGroup>
3940
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4041
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -43,13 +44,15 @@
4344
<WholeProgramOptimization>true</WholeProgramOptimization>
4445
<CharacterSet>Unicode</CharacterSet>
4546
<TargetName>gtest</TargetName>
47+
<VCToolsVersion />
4648
</PropertyGroup>
4749
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4850
<ConfigurationType>StaticLibrary</ConfigurationType>
4951
<UseDebugLibraries>true</UseDebugLibraries>
5052
<PlatformToolset>v142</PlatformToolset>
5153
<CharacterSet>Unicode</CharacterSet>
5254
<TargetName>gtestd</TargetName>
55+
<VCToolsVersion />
5356
</PropertyGroup>
5457
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5558
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -58,6 +61,7 @@
5861
<WholeProgramOptimization>true</WholeProgramOptimization>
5962
<CharacterSet>Unicode</CharacterSet>
6063
<TargetName>gtest</TargetName>
64+
<VCToolsVersion />
6165
</PropertyGroup>
6266
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6367
<ImportGroup Label="ExtensionSettings">

‎src/Servers/IIS/IIS/samples/NativeIISSample/Startup.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,15 @@ public void Configure(IApplicationBuilder app)
118118

119119
public static void Main(string[] args)
120120
{
121-
var host = new WebHostBuilder()
122-
.UseKestrel()
123-
.UseIIS()
124-
.UseIISIntegration()
125-
.UseStartup<Startup>()
126-
.Build();
127-
128-
host.Run();
121+
throw new Exception();
122+
//var host = new WebHostBuilder()
123+
// .UseKestrel()
124+
// .UseIIS()
125+
// .UseIISIntegration()
126+
// .UseStartup<Startup>()
127+
// .Build();
128+
129+
//host.Run();
129130
}
130131
}
131132
}

‎src/Servers/IIS/build/Build.Settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildThisFileDirectory)..\</SolutionDir>
55
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
66
<Platform Condition="'$(Platform)' == ''">Win32</Platform>
7-
<PlatformToolset>v141</PlatformToolset>
7+
<PlatformToolset>v142</PlatformToolset>
88
<OutputPath Condition="'$(OutputPath)' == ''">$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutputPath>
99
<OutDir>$(OutputPath)</OutDir>
1010
<AspNetCoreModuleTargetName>aspnetcore</AspNetCoreModuleTargetName>

0 commit comments

Comments
 (0)