Skip to content

Commit d536868

Browse files
jkotalikNate McMaster
jkotalik
authored and
Nate McMaster
committed
Merge branch 'release/2.1' into release/2.2
2 parents f4bb260 + 37291ea commit d536868

File tree

511 files changed

+1040
-2051
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

511 files changed

+1040
-2051
lines changed

‎eng/ProjectReferences.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepositoryRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
3939
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Connections.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj" />
4040
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.HttpSys" ProjectPath="$(RepositoryRoot)src\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj" />
41-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
42-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IIS" ProjectPath="$(RepositoryRoot)src\Servers\IIS\src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj" />
43-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" ProjectPath="$(RepositoryRoot)src\Servers\IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" />
41+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
42+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IIS" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IIS\src\Microsoft.AspNetCore.Server.IIS.csproj" />
43+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" />
4444
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Core" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj" />
4545
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Https" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj" />
4646
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj" />

‎src/Middleware/CORS/test/FunctionalTests/package-lock.json

Lines changed: 11 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Servers/IIS/.gitignore

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,24 @@ project.lock.json
3737
*.CppClean.log
3838
*msbuild.log
3939
gtest.log
40-
41-
src/*/*/Debug/
42-
src/*/*/x64/Debug/
43-
src/*/*/Release/
44-
src/*/*/x64/Release/
40+
Debug/
41+
x64/Debug/
42+
Release/
43+
x64/Release/
4544
x64/
4645
*vcxproj.filters
4746
*.aps
4847
*.pdb
4948
*.lib
5049
*.idb
51-
*.TMP
52-
53-
src/*/AspNetCore/aspnetcoremodule.h
54-
src/*/AspNetCore/aspnetcore_msg.h
55-
src/*/AspNetCore/aspnetcore_msg.rc
56-
src/*/*/version.h
57-
src/*/InProcessRequestHandler/version.h
58-
src/*/OutOfProcessRequestHandler/version.h
59-
src/*/CommonLib/aspnetcore_msg.h
60-
src/*/CommonLib/aspnetcore_msg.rc
50+
*.res
51+
*.pch
52+
aspnetcoremodule.h
53+
AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h
54+
AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h
55+
AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc
56+
AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
57+
version.h
6158
test/*/Debug
6259
test/*/Release
6360
.build

‎src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj renamed to ‎src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\..\Build\Build.Settings" />
3+
<Import Project="..\..\build\Build.Settings" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|Win32">
66
<Configuration>Debug</Configuration>
@@ -260,7 +260,7 @@
260260
<Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project>
261261
</ProjectReference>
262262
</ItemGroup>
263-
<Import Project="..\..\..\build\native.targets" />
263+
<Import Project="..\..\build\native.targets" />
264264
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
265265
<ImportGroup Label="ExtensionTargets">
266266
</ImportGroup>

‎src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h renamed to ‎src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/application.h

File renamed without changes.

‎src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h renamed to ‎src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h

File renamed without changes.

‎src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h renamed to ‎src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h

File renamed without changes.

‎src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h renamed to ‎src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h

File renamed without changes.

‎src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h renamed to ‎src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h

File renamed without changes.

‎src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h renamed to ‎src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h

File renamed without changes.

0 commit comments

Comments
 (0)