Skip to content

Commit 37291ea

Browse files
authored
Fix IISIntegration folder structure (#6063)
1 parent 80bb14c commit 37291ea

File tree

127 files changed

+123
-1594
lines changed

Some content is hidden

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

127 files changed

+123
-1594
lines changed

eng/ProjectReferences.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepositoryRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
3838
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Connections.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj" />
3939
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.HttpSys" ProjectPath="$(RepositoryRoot)src\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj" />
40-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
40+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
4141
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Core" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj" />
4242
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Https" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj" />
4343
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj" />

src/Servers/IIS/.gitignore

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,12 @@ x64/
4545
*.pdb
4646
*.lib
4747
*.idb
48-
src/*/AspNetCore/aspnetcoremodule.h
49-
src/*/AspNetCore/aspnetcore_msg.h
50-
src/*/AspNetCore/aspnetcore_msg.rc
51-
src/*/*/version.h
52-
src/*/RequestHandler/version.h
53-
src/*/CommonLib/aspnetcore_msg.h
54-
src/*/CommonLib/aspnetcore_msg.rc
48+
AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.h
49+
AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h
50+
AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc
51+
AspNetCoreModuleV1/AspNetCore/version.h
5552
test/*/Debug
5653
test/*/Release
57-
test/gtest-1.8.0/msvc/Debug
58-
test/gtest-1.8.0/msvc/Release
5954
.build
6055
*.VC.*db
6156
global.json

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>
@@ -268,7 +268,7 @@
268268
<Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project>
269269
</ProjectReference>
270270
</ItemGroup>
271-
<Import Project="..\..\..\build\native.targets" />
271+
<Import Project="..\..\build\native.targets" />
272272
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
273273
<ImportGroup Label="ExtensionTargets">
274274
</ImportGroup>

0 commit comments

Comments
 (0)