diff --git a/Directory.Build.props b/Directory.Build.props index 69eeabe374..eac6ac92f3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -88,6 +88,7 @@ $(RepositoryRoot)src\submodules\googletest\ true + true diff --git a/build/buildorder.props b/build/buildorder.props index 4e44ced9e1..83fb4146e7 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -10,7 +10,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index 5056b0bfd5..6308fb537d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -29,7 +29,7 @@ $(KoreBuildVersion) $(KoreBuildVersion) $(KoreBuildVersion) - 2.2.1-build-20181213.2 + 2.2.1-build-20190104.5 diff --git a/build/repo.props b/build/repo.props index d6ae8f6973..dd303bdd29 100644 --- a/build/repo.props +++ b/build/repo.props @@ -107,6 +107,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 052d1542ac..96082dbcff 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -42,7 +42,6 @@ - diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 5e767d1a5d..0e03ba4da3 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -42,6 +42,7 @@ and are generated based on the last package release. + diff --git a/global.json b/global.json index fdc8dcb766..ae29c6398a 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "2.2.100" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.1-build-20181213.2" + "Internal.AspNetCore.Sdk": "2.2.1-build-20190104.5" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 0ced696eb0..1edf4372b2 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.1-build-20181213.2 -commithash:3a55c25b0b17b7ff51010d1b4dfe50a0295c0a4f +version:2.2.1-build-20190104.5 +commithash:abf5766bd636c29b089ea2995ada30de00d563ff 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 467efab93a..1be0002b9c 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -14,6 +14,8 @@ + + @@ -23,5 +25,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 506c1e4e1f..0000000000 --- a/src/MusicStore/Directory.Build.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) - $(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/dependencies.props b/src/MusicStore/build/dependencies.props deleted file mode 100644 index 0823a8fc56..0000000000 --- a/src/MusicStore/build/dependencies.props +++ /dev/null @@ -1,51 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.0.9 - 2.1.3 - 2.2.0-preview3-26927-02 - 2.2.0-preview3-35359 - 15.6.1 - 2.0.3 - 4.6.0-preview3-26927-02 - 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 6d30be91fb..0000000000 --- a/src/MusicStore/build/repo.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - 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 c822aff7b6..d26c83980c 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -10,39 +10,40 @@ full + + - - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/MusicStore/samples/MusicStore/Properties/launchSettings.json b/src/MusicStore/samples/MusicStore/Properties/launchSettings.json index a2f3822f09..246b7a0b47 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)", + "ANCM_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 c46c1c57f1..0000000000 --- a/src/MusicStore/test/Directory.Build.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 - $(StandardTestTfms);net461 - - - - - - - - diff --git a/src/MusicStore/test/MusicStore.E2ETests/Implementation/Validator.cs b/src/MusicStore/test/MusicStore.E2ETests/Implementation/Validator.cs index de2848fc85..301a57da51 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; @@ -114,9 +114,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 144cff0587..40c96cbd9b 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj +++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj @@ -3,6 +3,7 @@ netcoreapp2.2 MusicStore.E2ETests + MusicStore.E2ETests true true $(WarningsNotAsErrors);xUnit1004 @@ -14,20 +15,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj b/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj index 88d02b1a8e..bf06a50a4c 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/IIS/.gitignore b/src/Servers/IIS/.gitignore index 280e795a56..694e8789e7 100644 --- a/src/Servers/IIS/.gitignore +++ b/src/Servers/IIS/.gitignore @@ -50,10 +50,8 @@ x64/ *.res *.pch aspnetcoremodule.h -AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h -AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h -AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc -AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc +aspnetcore_msg.h +aspnetcore_msg.rc version.h test/*/Debug test/*/Release diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc deleted file mode 100644 index 0abcb0fa2c..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc +++ /dev/null @@ -1,2 +0,0 @@ -LANGUAGE 0x9,0x1 -1 11 "MSG00001.bin" diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index e859f7d25a..87bcbb09ea 100644 --- a/src/Servers/IIS/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -1,7 +1,7 @@ - win7-x64;win7-x86 + $(RuntimeIdentifiers);win7-x64;win7-x86 x64;x86 $(MSBuildThisFileDirectory)applicationhost.config $(MSBuildThisFileDirectory)applicationhost.iis.config