diff --git a/IISIntegration.sln b/IISIntegration.sln
index d7b6919dbd..636f15279e 100644
--- a/IISIntegration.sln
+++ b/IISIntegration.sln
@@ -37,6 +37,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestSites", "test\TestSites
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E-9CC8-450C-8A8D-94FC76428150}"
ProjectSection(SolutionItems) = preProject
+ build\applicationhost.config = build\applicationhost.config
+ build\applicationhost.iis.config = build\applicationhost.iis.config
build\dependencies.props = build\dependencies.props
build\Key.snk = build\Key.snk
build\native.targets = build\native.targets
diff --git a/build/applicationhost.iis.config b/build/applicationhost.iis.config
new file mode 100644
index 0000000000..1998fc2d86
--- /dev/null
+++ b/build/applicationhost.iis.config
@@ -0,0 +1,730 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/testsite.props b/build/testsite.props
index b488694b72..549556790f 100644
--- a/build/testsite.props
+++ b/build/testsite.props
@@ -4,20 +4,11 @@
win7-x64;win7-x86
x64;x86
$(MSBuildThisFileDirectory)applicationhost.config
+ $(MSBuildThisFileDirectory)applicationhost.iis.config
x64
$(Platform)
- $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe
-
- $(MSBuildProgramFiles32)\IIS Express\iisexpress.exe
- Win32
-
-
-
- $(ProgramW6432)\IIS Express\iisexpress.exe
- x64
-
@@ -26,4 +17,24 @@
+
+ $(MSBuildProgramFiles32)\IIS Express\iisexpress.exe
+ $(SystemRoot)\SysWOW64\inetsrv\w3wp.exe
+ Win32
+
+
+
+ $(ProgramW6432)\IIS Express\iisexpress.exe
+ $(SystemRoot)\System32\inetsrv\w3wp.exe
+ x64
+
+
+
+ /config:"$(IISExpressAppHostConfig)"
+ -h "$(IISAppHostConfig)"
+
+ $(NativePlatform)\aspnetcore.dll
+ $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe
+
+
diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/samples/NativeIISSample/Properties/launchSettings.json
index 6b5011ca42..7d09a120ab 100644
--- a/samples/NativeIISSample/Properties/launchSettings.json
+++ b/samples/NativeIISSample/Properties/launchSettings.json
@@ -8,25 +8,29 @@
}
},
"profiles": {
- "Local ANCM": {
+ "ANCM IIS Express": {
"commandName": "Executable",
- "executablePath": "$(IISExpress)",
- "commandLineArgs": "/config:\"$(IISExpressAppHostConfig)\" /apppool:\"Clr4IntegratedAppPool\"",
+ "executablePath": "$(IISExpressPath)",
+ "commandLineArgs": "$(IISExpressArguments)",
"environmentVariables": {
"IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
- "ANCM_PATH": "$(TargetDir)$(NativePlatform)\\aspnetcore.dll",
+ "ANCM_PATH": "$(TargetDir)$(AncmPath)",
"LAUNCHER_ARGS": "$(TargetPath)",
"ASPNETCORE_ENVIRONMENT": "Development",
"LAUNCHER_PATH": "$(DotNetPath)"
}
},
- "NativeIISSample": {
- "commandName": "Project",
- "launchBrowser": true,
+ "ANCM IIS": {
+ "commandName": "Executable",
+ "executablePath": "$(IISPath)",
+ "commandLineArgs": "$(IISArguments)",
"environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- },
- "applicationUrl": "http://localhost:5763/"
+ "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
+ "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+ "LAUNCHER_ARGS": "$(TargetPath)",
+ "ASPNETCORE_ENVIRONMENT": "Development",
+ "LAUNCHER_PATH": "$(DotNetPath)"
+ }
}
}
}
diff --git a/test/IISTestSite/Properties/launchSettings.json b/test/IISTestSite/Properties/launchSettings.json
index 6b5011ca42..7d09a120ab 100644
--- a/test/IISTestSite/Properties/launchSettings.json
+++ b/test/IISTestSite/Properties/launchSettings.json
@@ -8,25 +8,29 @@
}
},
"profiles": {
- "Local ANCM": {
+ "ANCM IIS Express": {
"commandName": "Executable",
- "executablePath": "$(IISExpress)",
- "commandLineArgs": "/config:\"$(IISExpressAppHostConfig)\" /apppool:\"Clr4IntegratedAppPool\"",
+ "executablePath": "$(IISExpressPath)",
+ "commandLineArgs": "$(IISExpressArguments)",
"environmentVariables": {
"IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
- "ANCM_PATH": "$(TargetDir)$(NativePlatform)\\aspnetcore.dll",
+ "ANCM_PATH": "$(TargetDir)$(AncmPath)",
"LAUNCHER_ARGS": "$(TargetPath)",
"ASPNETCORE_ENVIRONMENT": "Development",
"LAUNCHER_PATH": "$(DotNetPath)"
}
},
- "NativeIISSample": {
- "commandName": "Project",
- "launchBrowser": true,
+ "ANCM IIS": {
+ "commandName": "Executable",
+ "executablePath": "$(IISPath)",
+ "commandLineArgs": "$(IISArguments)",
"environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- },
- "applicationUrl": "http://localhost:5763/"
+ "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
+ "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+ "LAUNCHER_ARGS": "$(TargetPath)",
+ "ASPNETCORE_ENVIRONMENT": "Development",
+ "LAUNCHER_PATH": "$(DotNetPath)"
+ }
}
}
}
diff --git a/test/TestSites/Properties/launchSettings.json b/test/TestSites/Properties/launchSettings.json
index 6b5011ca42..7d09a120ab 100644
--- a/test/TestSites/Properties/launchSettings.json
+++ b/test/TestSites/Properties/launchSettings.json
@@ -8,25 +8,29 @@
}
},
"profiles": {
- "Local ANCM": {
+ "ANCM IIS Express": {
"commandName": "Executable",
- "executablePath": "$(IISExpress)",
- "commandLineArgs": "/config:\"$(IISExpressAppHostConfig)\" /apppool:\"Clr4IntegratedAppPool\"",
+ "executablePath": "$(IISExpressPath)",
+ "commandLineArgs": "$(IISExpressArguments)",
"environmentVariables": {
"IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
- "ANCM_PATH": "$(TargetDir)$(NativePlatform)\\aspnetcore.dll",
+ "ANCM_PATH": "$(TargetDir)$(AncmPath)",
"LAUNCHER_ARGS": "$(TargetPath)",
"ASPNETCORE_ENVIRONMENT": "Development",
"LAUNCHER_PATH": "$(DotNetPath)"
}
},
- "NativeIISSample": {
- "commandName": "Project",
- "launchBrowser": true,
+ "ANCM IIS": {
+ "commandName": "Executable",
+ "executablePath": "$(IISPath)",
+ "commandLineArgs": "$(IISArguments)",
"environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- },
- "applicationUrl": "http://localhost:5763/"
+ "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
+ "ANCM_PATH": "$(TargetDir)$(AncmPath)",
+ "LAUNCHER_ARGS": "$(TargetPath)",
+ "ASPNETCORE_ENVIRONMENT": "Development",
+ "LAUNCHER_PATH": "$(DotNetPath)"
+ }
}
}
}