diff --git a/Directory.Build.props b/Directory.Build.props index 5f7322d556..c0ca1a77d2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -104,6 +104,7 @@ true true true + true diff --git a/build/buildorder.props b/build/buildorder.props index 82647f7811..4fa561a979 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -7,7 +7,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index 9b2cf47d25..d1595e4670 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -119,7 +119,7 @@ $(KoreBuildVersion) $(KoreBuildVersion) - 3.0.0-build-20181214.1 + 3.0.0-build-20190105.1 diff --git a/build/repo.props b/build/repo.props index ec96979315..ea0b617b19 100644 --- a/build/repo.props +++ b/build/repo.props @@ -120,6 +120,7 @@ $(RepositoryRoot)src\Razor\**\*.*proj; $(RepositoryRoot)src\Mvc\**\*.*proj; $(RepositoryRoot)src\Azure\**\*.*proj; + $(RepositoryRoot)src\MusicStore\**\*.*proj; " Exclude=" @(ProjectToExclude); diff --git a/build/submodules.props b/build/submodules.props index 81d3c309c3..acb5914384 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -42,6 +42,5 @@ - diff --git a/global.json b/global.json index ec110d15d8..2e7df14e6b 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "3.0.100-preview-009750" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "3.0.0-build-20190104.3" + "Internal.AspNetCore.Sdk": "3.0.0-build-20190105.1" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 8349287fdf..b10d682b80 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-build-20190104.3 -commithash:1cc7b8211d23fd469ad03c73ff45e4d291b24be7 +version:3.0.0-build-20190105.1 +commithash:f61a6ea29c9697719acc53326726dfbe7acee915 diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index 324891f27c..80893bda8e 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -13,6 +13,8 @@ + + @@ -22,5 +24,4 @@ - diff --git a/src/MusicStore/.gitignore b/src/MusicStore/.gitignore deleted file mode 100644 index aba684a076..0000000000 --- a/src/MusicStore/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -[Oo]bj/ -[Bb]in/ -.vs/ -*.xap -*.user -/TestResults -*.vspscc -*.vssscc -*.suo -*.cache -*.docstates -*.log -_ReSharper.* -*.csproj.user -*[Rr]e[Ss]harper.user -_ReSharper.*/ -packages/* -artifacts/* -PublishProfiles/ -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.log -*.vspx -/.symbols -nuget.exe -*net45.csproj -*k10.csproj -App_Data/ -bower_components -node_modules -*.sln.ide -*.ng.ts -*.sln.ide -.build/ -.testpublish/ -launchSettings.json -.vscode/ -TestResults/ -global.json diff --git a/src/MusicStore/Directory.Build.props b/src/MusicStore/Directory.Build.props deleted file mode 100644 index 0a0ea641fe..0000000000 --- a/src/MusicStore/Directory.Build.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - true - - diff --git a/src/MusicStore/Directory.Build.targets b/src/MusicStore/Directory.Build.targets deleted file mode 100644 index 3367fc79e4..0000000000 --- a/src/MusicStore/Directory.Build.targets +++ /dev/null @@ -1,9 +0,0 @@ - - - - $(MicrosoftNETCoreApp30PackageVersion) - $(NETStandardLibrary20PackageVersion) - - 99.9 - - diff --git a/src/MusicStore/MusicStore.sln b/src/MusicStore/MusicStore.sln index c4bbf45bde..7c9bd93ac3 100644 --- a/src/MusicStore/MusicStore.sln +++ b/src/MusicStore/MusicStore.sln @@ -36,12 +36,9 @@ Global RuntimeStore|Any CPU = RuntimeStore|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Any CPU.Build.0 = Release|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.RuntimeStore|Any CPU.ActiveCfg = RuntimeStore|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.RuntimeStore|Any CPU.Build.0 = RuntimeStore|Any CPU + {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Any CPU.ActiveCfg = Debug|x86 + {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Any CPU.ActiveCfg = Release|x86 + {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.RuntimeStore|Any CPU.ActiveCfg = RuntimeStore|x86 {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA663205-77DE-4E55-B300-85594181B5A9}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/MusicStore/README.md b/src/MusicStore/README.md index 7574a9b660..011866be61 100644 --- a/src/MusicStore/README.md +++ b/src/MusicStore/README.md @@ -1,20 +1,9 @@ MusicStore (test application) ============================= -AppVeyor: [![AppVeyor][appveyor-badge]][appveyor-build] +This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/aspnetcore) repo. -Travis: [![Travis][travis-badge]][travis-build] - -[appveyor-badge]: https://ci.appveyor.com/api/projects/status/ja8a7j6jscj7k3xa/branch/dev?svg=true -[appveyor-build]: https://ci.appveyor.com/project/aspnetci/MusicStore/branch/dev -[travis-badge]: https://travis-ci.org/aspnet/MusicStore.svg?branch=dev -[travis-build]: https://travis-ci.org/aspnet/MusicStore - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. - -## About this repo - -This repository is a test application used for ASP.NET Core internal test processes. +This is a test application used for ASP.NET Core internal test processes. It is not intended to be a representative sample of how to use ASP.NET Core. Samples and docs for ASP.NET Core can be found here: . diff --git a/src/MusicStore/build.cmd b/src/MusicStore/build.cmd new file mode 100644 index 0000000000..033fe6f614 --- /dev/null +++ b/src/MusicStore/build.cmd @@ -0,0 +1,3 @@ +@ECHO OFF +SET RepoRoot=%~dp0..\.. +%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* diff --git a/src/MusicStore/build/dependencies.props b/src/MusicStore/build/dependencies.props deleted file mode 100644 index b1a4f36c1f..0000000000 --- a/src/MusicStore/build/dependencies.props +++ /dev/null @@ -1,50 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 3.0.0-alpha1-10670 - 2.2.0-rtm-10670 - 2.2.0-rtm-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 2.2.0-rtm-10670 - 2.2.0-rtm-10670 - 0.7.0-a-alpha1-3-0-tfm-17161 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10657 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-preview1-26907-05 - 3.0.0-preview-18579-0056 - 15.6.1 - 2.0.3 - 4.6.0-preview1-26907-04 - 2.3.1 - 2.4.0 - - - - - diff --git a/src/MusicStore/build/repo.props b/src/MusicStore/build/repo.props deleted file mode 100644 index 738780b26d..0000000000 --- a/src/MusicStore/build/repo.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - false - - - - - - - diff --git a/src/MusicStore/build/repo.targets b/src/MusicStore/build/repo.targets deleted file mode 100644 index 9d4c8a8df6..0000000000 --- a/src/MusicStore/build/repo.targets +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Configuration=RuntimeStore - - - - - $(RepositoryRoot)test\MusicStore.E2ETests\MusicStore.E2ETests.csproj - - - - - - - - - - - - - - - - - - VSTestTestCaseFilter=E2ETests=NanoServer - - - - - - VSTestTestCaseFilter=smoketests=usestore - - - - diff --git a/src/MusicStore/build/sources.props b/src/MusicStore/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/MusicStore/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj index c354db8eb1..71371e9cc4 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -1,5 +1,7 @@  + + Music store application on ASP.NET Core netcoreapp3.0 @@ -7,6 +9,8 @@ true win7-x86;win7-x64;linux-x64;osx-x64 Debug;Release;RuntimeStore + true + AspNetCoreModuleV2 @@ -14,28 +18,29 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/MusicStore/samples/MusicStore/Properties/launchSettings.json b/src/MusicStore/samples/MusicStore/Properties/launchSettings.json index a2f3822f09..739ae702f5 100644 --- a/src/MusicStore/samples/MusicStore/Properties/launchSettings.json +++ b/src/MusicStore/samples/MusicStore/Properties/launchSettings.json @@ -1,27 +1,42 @@ { "iisSettings": { - "windowsAuthentication": false, + "windowsAuthentication": true, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:4088/", + "applicationUrl": "http://localhost:5762/", "sslPort": 0 } }, "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" } }, - "MusicStore": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "http://localhost:5000/", + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" } } } -} \ No newline at end of file +} diff --git a/src/MusicStore/test/Directory.Build.props b/src/MusicStore/test/Directory.Build.props deleted file mode 100644 index 6bb1f5a660..0000000000 --- a/src/MusicStore/test/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/MusicStore/test/MusicStore.E2ETests/Implementation/Validator.cs b/src/MusicStore/test/MusicStore.E2ETests/Implementation/Validator.cs index 1cf122fab8..07dd1f5bb6 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/Implementation/Validator.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/Implementation/Validator.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net; @@ -111,9 +111,6 @@ namespace E2ETests { //Helpers.ThrowIfResponseStatusNotOk(runtimeResponse, _logger); } - - // Verify the app is using precompiled views - Assert.Contains("MusicStore.Views, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", responseContent); } public void VerifyArchitecture(HttpResponseMessage response, RuntimeArchitecture arch) diff --git a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj index 1f4b0d7ab2..3603ca8429 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj +++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj @@ -3,6 +3,7 @@ netcoreapp3.0 MusicStore.E2ETests + MusicStore.E2ETests true true $(WarningsNotAsErrors);xUnit1004 @@ -16,22 +17,21 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs b/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs index 9ac91b4855..59d668d09e 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs @@ -17,7 +17,7 @@ namespace E2ETests public class NtlmAuthenticationTests : LoggedTest { public static TestMatrix TestVariants - => TestMatrix.ForServers(/*ServerType.IISExpress https://github.com/aspnet/AspNetCore/issues/6170*/ ServerType.HttpSys) + => TestMatrix.ForServers(ServerType.IISExpress, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAllArchitectures(); diff --git a/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs b/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs index 23e490715e..dd47eb8740 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs @@ -14,7 +14,7 @@ namespace E2ETests public class OpenIdConnectTests : LoggedTest { public static TestMatrix TestVariants - => TestMatrix.ForServers(/* ServerType.IISExpress https://github.com/aspnet/AspNetCore/issues/6170 */ ServerType.Kestrel) + => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel) .WithTfms(Tfm.NetCoreApp30); [ConditionalTheory] diff --git a/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs b/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs index d38acdd7e4..8105744498 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs @@ -14,27 +14,16 @@ namespace E2ETests [Trait("E2Etests", "PublishAndRun")] public class PublishAndRunTests : LoggedTest { - // ANCM tests disabled, see: https://github.com/aspnet/websdk/issues/422 public static TestMatrix TestVariants - => TestMatrix.ForServers(ServerType.Kestrel, ServerType.HttpSys) + => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAllAncmVersions() .WithAllHostingModels() .WithAllArchitectures(); - // ANCM In-process cannot run on netcoreapp2.1 and below - public static TestMatrix TestVariantsWithoutInproc - => TestMatrix.ForServers(ServerType.Kestrel, ServerType.HttpSys) - .WithTfms(Tfm.NetCoreApp30) - .WithAllApplicationTypes() - .WithAllAncmVersions() - .WithHostingModels(HostingModel.OutOfProcess) - .WithAllArchitectures(); - [ConditionalTheory] [MemberData(nameof(TestVariants))] - [MemberData(nameof(TestVariantsWithoutInproc))] public async Task PublishAndRun_Test(TestVariant variant) { var testName = $"PublishAndRunTests_{variant}"; diff --git a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs index 066e361a2f..7ac9817197 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs @@ -16,7 +16,7 @@ namespace E2ETests public class SmokeTests : LoggedTest { public static TestMatrix TestVariants - => TestMatrix.ForServers(/* ServerType.IISExpress, https://github.com/aspnet/AspNetCore/issues/6170*/ ServerType.Kestrel, ServerType.HttpSys) + => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAllAncmVersions() diff --git a/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj b/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj index 5e4eabf23c..88a794f766 100644 --- a/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj +++ b/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/Servers/FunctionalTests.sln b/src/Servers/FunctionalTests.sln index 6b14491050..82ddc71dc8 100644 --- a/src/Servers/FunctionalTests.sln +++ b/src/Servers/FunctionalTests.sln @@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.TestSites", "testassets\ServerComparison.TestSites\ServerComparison.TestSites.csproj", "{9D402831-ED2C-4026-925E-30F48371064A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "IIS\src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{6516E482-75AA-4B76-B9A6-87ABEE1DB625}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "IIS\IIS\src\Microsoft.AspNetCore.Server.IIS.csproj", "{5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -141,18 +141,18 @@ Global {9D402831-ED2C-4026-925E-30F48371064A}.Release|x64.Build.0 = Release|x64 {9D402831-ED2C-4026-925E-30F48371064A}.Release|x86.ActiveCfg = Release|x86 {9D402831-ED2C-4026-925E-30F48371064A}.Release|x86.Build.0 = Release|x86 - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Debug|x64.ActiveCfg = Debug|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Debug|x64.Build.0 = Debug|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Debug|x86.ActiveCfg = Debug|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Debug|x86.Build.0 = Debug|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Release|Any CPU.Build.0 = Release|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Release|x64.ActiveCfg = Release|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Release|x64.Build.0 = Release|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Release|x86.ActiveCfg = Release|Any CPU - {6516E482-75AA-4B76-B9A6-87ABEE1DB625}.Release|x86.Build.0 = Release|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Debug|x64.ActiveCfg = Debug|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Debug|x64.Build.0 = Debug|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Debug|x86.ActiveCfg = Debug|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Debug|x86.Build.0 = Debug|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Release|Any CPU.Build.0 = Release|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Release|x64.ActiveCfg = Release|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Release|x64.Build.0 = Release|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Release|x86.ActiveCfg = Release|Any CPU + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -165,7 +165,7 @@ Global {831EA089-7072-41CF-996A-75A3EF39D31E} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} {9DD063D3-CAE1-49C2-9C24-DE3499E79322} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} - {6516E482-75AA-4B76-B9A6-87ABEE1DB625} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {5DAF9603-999A-4759-AEE4-5E0F4D6D9AF7} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F4D963C1-44FE-45AE-9B2A-11CD86C7539F} diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index e859f7d25a..73ab14f888 100644 --- a/src/Servers/IIS/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -1,12 +1,14 @@ - win7-x64;win7-x86 + $(RuntimeIdentifiers);win7-x64;win7-x86 x64;x86 $(MSBuildThisFileDirectory)applicationhost.config $(MSBuildThisFileDirectory)applicationhost.iis.config false True + + OutOfProcess