diff --git a/Directory.Build.props b/Directory.Build.props index 2387a78ed5..8199c65d62 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -34,6 +34,7 @@ $(MSBuildThisFileDirectory)src\Shared\ true + true @@ -48,6 +49,5 @@ - diff --git a/Directory.Build.targets b/Directory.Build.targets index 0e9202f0c7..811b7b67c2 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -57,4 +57,5 @@ + 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 7d8d5ddb53..3d8184e977 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -19,7 +19,7 @@ $(KoreBuildVersion) $(KoreBuildVersion) - 2.1.3-rtm-15842 + 2.1.7-build-20190104.1 diff --git a/build/repo.props b/build/repo.props index 460315713e..84a52a43ef 100644 --- a/build/repo.props +++ b/build/repo.props @@ -94,6 +94,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 a7f9ba0e39..6b8f409105 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -41,7 +41,6 @@ - diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 38a85583c3..a137e1591d 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -41,6 +41,7 @@ and are generated based on the last package release. + diff --git a/eng/targets/ResolveIisReferences.targets b/eng/targets/ResolveIisReferences.targets index bd3aefd5c1..216183f86c 100644 --- a/eng/targets/ResolveIisReferences.targets +++ b/eng/targets/ResolveIisReferences.targets @@ -8,7 +8,7 @@ with the right MSBuild incantations to get output copied to the right place. - + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index be0d5421ec..c40efa0746 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.7-build-20181213.1 -commithash:69f12b27418b4925734d427b2c3e36c53f265c12 +version:2.1.7-build-20190104.4 +commithash:8698fc7a305cbb97fcfa69e52323ee1b0c149165 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 2ff45704c8..bc988b37b2 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -17,6 +17,8 @@ + + @@ -26,6 +28,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 53b3f6e1da..0000000000 --- a/src/MusicStore/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/MusicStore/MusicStore.sln b/src/MusicStore/MusicStore.sln index c4edf6d02a..7e2c8ac34d 100644 --- a/src/MusicStore/MusicStore.sln +++ b/src/MusicStore/MusicStore.sln @@ -31,12 +31,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/build/dependencies.props b/src/MusicStore/build/dependencies.props deleted file mode 100644 index f4573589cb..0000000000 --- a/src/MusicStore/build/dependencies.props +++ /dev/null @@ -1,54 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.1.2 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.2 - 2.1.2 - 2.1.1 - 2.1.1 - 2.1.2 - 2.1.1 - 0.5.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.0.0 - 2.1.2 - 2.1.1 - 15.6.1 - 2.0.3 - 4.5.1 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - diff --git a/src/MusicStore/build/repo.props b/src/MusicStore/build/repo.props deleted file mode 100644 index 1dc8b8100d..0000000000 --- a/src/MusicStore/build/repo.props +++ /dev/null @@ -1,8 +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 aad674d3f4..25f7cc5a4a 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -10,37 +10,37 @@ full + + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + 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 dfe425b2a6..ec85033ff0 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 async Task VerifyNtlmHomePage(HttpResponseMessage response) diff --git a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj index 8d60d53eac..aaae694f66 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj +++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj @@ -1,8 +1,9 @@ - + netcoreapp2.1;netcoreapp2.0 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 ca4c333468..06a2c280c6 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 5b91e632d0..c20b0c453b 100644 --- a/src/Servers/IIS/.gitignore +++ b/src/Servers/IIS/.gitignore @@ -43,10 +43,10 @@ x64/ *.pdb *.lib *.idb -AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.h -AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h -AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc -AspNetCoreModuleV1/AspNetCore/version.h +aspnetcoremodule.h +aspnetcore_msg.h +aspnetcore_msg.rc +version.h test/*/Debug test/*/Release .build diff --git a/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h deleted file mode 100644 index 3c95a91f47..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h +++ /dev/null @@ -1,129 +0,0 @@ -/*++ - -Copyright (c) 2014 Microsoft Corporation - -Module Name: - - aspnetcore_msg.mc - -Abstract: - - Asp.Net Core Module localizable messages. - ---*/ - - -#ifndef _ASPNETCORE_MSG_H_ -#define _ASPNETCORE_MSG_H_ - -// -// Values are 32 bit values laid out as follows: -// -// 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 -// 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 -// +---+-+-+-----------------------+-------------------------------+ -// |Sev|C|R| Facility | Code | -// +---+-+-+-----------------------+-------------------------------+ -// -// where -// -// Sev - is the severity code -// -// 00 - Success -// 01 - Informational -// 10 - Warning -// 11 - Error -// -// C - is the Customer code flag -// -// R - is a reserved bit -// -// Facility - is the facility code -// -// Code - is the facility's status code -// -// -// Define the facility codes -// - - -// -// Define the severity codes -// - - -// -// MessageId: ASPNETCORE_EVENT_PROCESS_START_ERROR -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_PROCESS_START_ERROR ((DWORD)0x000003E8L) - -// -// MessageId: ASPNETCORE_EVENT_PROCESS_START_SUCCESS -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_PROCESS_START_SUCCESS ((DWORD)0x000003E9L) - -// -// MessageId: ASPNETCORE_EVENT_PROCESS_CRASH -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_PROCESS_CRASH ((DWORD)0x000003EAL) - -// -// MessageId: ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED ((DWORD)0x000003EBL) - -// -// MessageId: ASPNETCORE_EVENT_CONFIG_ERROR -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_CONFIG_ERROR ((DWORD)0x000003ECL) - -// -// MessageId: ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE ((DWORD)0x000003EDL) - -// -// MessageId: ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST ((DWORD)0x000003EEL) - -// -// MessageId: ASPNETCORE_EVENT_RECYCLE_APPOFFLINE -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_RECYCLE_APPOFFLINE ((DWORD)0x000003F4L) - - -#endif // _ASPNETCORE_MODULE_MSG_H_ - diff --git a/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc deleted file mode 100644 index 0abcb0fa2c..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc +++ /dev/null @@ -1,2 +0,0 @@ -LANGUAGE 0x9,0x1 -1 11 "MSG00001.bin" diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj b/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj index 23d8506c06..de37395456 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -1,9 +1,8 @@ - + $(StandardTestTfms) - - true + IISIntegration.E2ETests diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index 76714bf735..e041e556e8 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 diff --git a/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj index 9c041963b1..8a6dceefc0 100644 --- a/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj +++ b/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj @@ -8,7 +8,7 @@ - +