From a8ae16e0cb647330bb526294c61fcd1548d3d692 Mon Sep 17 00:00:00 2001 From: Kahbazi Date: Thu, 13 Dec 2018 11:08:12 +0330 Subject: [PATCH 01/80] Change JwtBearerOptions.Audience comment (#4646) --- .../JwtBearerOptions.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerOptions.cs b/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerOptions.cs index 0d0a88e247..976ddc581e 100644 --- a/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerOptions.cs +++ b/src/Security/src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerOptions.cs @@ -33,7 +33,8 @@ namespace Microsoft.AspNetCore.Authentication.JwtBearer public string Authority { get; set; } /// - /// Gets or sets the audience for any received OpenIdConnect token. + /// Gets or sets a single valid audience value for any received OpenIdConnect token. + /// This value is passed into TokenValidationParameters.ValidAudience if that property is empty. /// /// /// The expected audience for any received OpenIdConnect token. From 0cbc52ca157bf8b98741e6a9ecef69d071632894 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 Dec 2018 11:59:47 -0800 Subject: [PATCH 02/80] Convert ServerTests to Reference and move to Server folder (#4686) --- build/buildorder.props | 1 - build/dependencies.props | 2 + build/submodules.props | 1 - .../MusicStore.E2ETests/SmokeTests_X64.cs | 2 +- src/ServerTests/.gitignore | 31 ---- src/ServerTests/Directory.Build.props | 22 --- src/ServerTests/Directory.Build.targets | 7 - src/ServerTests/NuGetPackageVerifier.json | 7 - src/ServerTests/README.md | 9 - src/ServerTests/ServerTests.sln | 50 ------ src/ServerTests/build/dependencies.props | 39 ----- src/ServerTests/build/repo.props | 12 -- src/ServerTests/build/sources.props | 17 -- src/ServerTests/install-nginx.sh | 6 - src/ServerTests/test/Directory.Build.props | 9 - .../ServerComparison.FunctionalTests.csproj | 24 --- .../Properties/launchSettings.json | 25 --- .../ServerComparison.TestSites.csproj | 28 --- src/ServerTests/version.props | 12 -- src/Servers/FunctionalTests.sln | 160 ++++++++++++++++++ .../OutOfProcess/HelloWorldTest.cs | 2 +- .../OutOfProcess/NtlmAuthentationTest.cs | 2 +- .../test/FunctionalTests}/HelloWorldTest.cs | 16 +- .../test/FunctionalTests}/Helpers.cs | 10 +- .../test/FunctionalTests}/Http.config | 0 .../test/FunctionalTests}/NoCompression.conf | 0 .../FunctionalTests}/NoCompression.config | 0 .../NtlmAuthentication.config | 0 .../NtlmAuthenticationTest.cs | 9 +- .../Properties/AssemblyInfo.cs | 0 .../ResponseCompressionTests.cs | 108 ++++++------ .../test/FunctionalTests}/ResponseTests.cs | 32 ++-- .../ServerComparison.FunctionalTests.csproj | 26 +++ .../test/FunctionalTests}/nginx.conf | 0 .../testassets/TestSites}/Program.cs | 2 +- .../ServerComparison.TestSites.csproj | 24 +++ .../TestSites}/StartupHelloWorld.cs | 0 .../TestSites}/StartupNtlmAuthentication.cs | 0 .../TestSites}/StartupResponseCompression.cs | 0 .../testassets/TestSites}/StartupResponses.cs | 0 .../testassets/TestSites}/web.config | 0 41 files changed, 291 insertions(+), 404 deletions(-) delete mode 100644 src/ServerTests/.gitignore delete mode 100644 src/ServerTests/Directory.Build.props delete mode 100644 src/ServerTests/Directory.Build.targets delete mode 100644 src/ServerTests/NuGetPackageVerifier.json delete mode 100644 src/ServerTests/README.md delete mode 100644 src/ServerTests/ServerTests.sln delete mode 100644 src/ServerTests/build/dependencies.props delete mode 100644 src/ServerTests/build/repo.props delete mode 100644 src/ServerTests/build/sources.props delete mode 100644 src/ServerTests/install-nginx.sh delete mode 100644 src/ServerTests/test/Directory.Build.props delete mode 100644 src/ServerTests/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj delete mode 100644 src/ServerTests/test/ServerComparison.TestSites/Properties/launchSettings.json delete mode 100644 src/ServerTests/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj delete mode 100644 src/ServerTests/version.props create mode 100644 src/Servers/FunctionalTests.sln rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/HelloWorldTest.cs (87%) rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/Helpers.cs (89%) rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/Http.config (100%) rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/NoCompression.conf (100%) rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/NoCompression.config (100%) rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/NtlmAuthentication.config (100%) rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/NtlmAuthenticationTest.cs (85%) rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/Properties/AssemblyInfo.cs (100%) rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/ResponseCompressionTests.cs (79%) rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/ResponseTests.cs (93%) create mode 100644 src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj rename src/{ServerTests/test/ServerComparison.FunctionalTests => Servers/test/FunctionalTests}/nginx.conf (100%) rename src/{ServerTests/test/ServerComparison.TestSites => Servers/testassets/TestSites}/Program.cs (99%) create mode 100644 src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj rename src/{ServerTests/test/ServerComparison.TestSites => Servers/testassets/TestSites}/StartupHelloWorld.cs (100%) rename src/{ServerTests/test/ServerComparison.TestSites => Servers/testassets/TestSites}/StartupNtlmAuthentication.cs (100%) rename src/{ServerTests/test/ServerComparison.TestSites => Servers/testassets/TestSites}/StartupResponseCompression.cs (100%) rename src/{ServerTests/test/ServerComparison.TestSites => Servers/testassets/TestSites}/StartupResponses.cs (100%) rename src/{ServerTests/test/ServerComparison.TestSites => Servers/testassets/TestSites}/web.config (100%) diff --git a/build/buildorder.props b/build/buildorder.props index ec15a752e5..5a71a5701c 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -8,7 +8,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index 1ab5074b56..c46766b7af 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -80,6 +80,8 @@ 2.1.1 + 2.1.1 + 2.1.1 2.1.1 2.1.1 0.5.1 diff --git a/build/submodules.props b/build/submodules.props index c96fb1b2e1..01c2e2ed0d 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -42,7 +42,6 @@ - diff --git a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests_X64.cs b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests_X64.cs index d57962e9f1..8bd24e52c9 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests_X64.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests_X64.cs @@ -37,7 +37,7 @@ namespace E2ETests return _smokeTestRunner.SmokeTestSuite(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone); } #if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each - [ConditionalFact(Skip = "https://github.com/aspnet/websdk/pull/322")] + [ConditionalFact] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] public Task SmokeTests_X64_IISExpress_Clr() { diff --git a/src/ServerTests/.gitignore b/src/ServerTests/.gitignore deleted file mode 100644 index a7760db659..0000000000 --- a/src/ServerTests/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -project.lock.json -/.vs/ -.testPublish/ -.build/ -global.json diff --git a/src/ServerTests/Directory.Build.props b/src/ServerTests/Directory.Build.props deleted file mode 100644 index cefef093b1..0000000000 --- a/src/ServerTests/Directory.Build.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - true - - - - - - - diff --git a/src/ServerTests/Directory.Build.targets b/src/ServerTests/Directory.Build.targets deleted file mode 100644 index 53b3f6e1da..0000000000 --- a/src/ServerTests/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/ServerTests/NuGetPackageVerifier.json b/src/ServerTests/NuGetPackageVerifier.json deleted file mode 100644 index 22ef3c09c0..0000000000 --- a/src/ServerTests/NuGetPackageVerifier.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} diff --git a/src/ServerTests/README.md b/src/ServerTests/README.md deleted file mode 100644 index 355a989132..0000000000 --- a/src/ServerTests/README.md +++ /dev/null @@ -1,9 +0,0 @@ -Server Tests -============ - -[![Travis build status](https://img.shields.io/travis/aspnet/ServerTests.svg?label=travis-ci&branch=dev&style=flat-square)](https://travis-ci.org/aspnet/ServerTests/branches) -[![AppVeyor build status](https://img.shields.io/appveyor/ci/aspnetci/ServerTests/dev.svg?label=appveyor&style=flat-square)](https://ci.appveyor.com/project/aspnetci/ServerTests/branch/dev) - -This repo hosts [HttpSysServer](https://github.com/aspnet/HttpSysServer) and [Kestrel](https://github.com/aspnet/KestrelHttpServer) tests. - -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. diff --git a/src/ServerTests/ServerTests.sln b/src/ServerTests/ServerTests.sln deleted file mode 100644 index bd58846053..0000000000 --- a/src/ServerTests/ServerTests.sln +++ /dev/null @@ -1,50 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{49AB8AAA-8160-48DF-A18B-78F51E54E02A}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - NuGet.config = NuGet.config - build\repo.props = build\repo.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FA91F388-F4AF-4850-9D68-D4D128E6B1A6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "test\ServerComparison.FunctionalTests\ServerComparison.FunctionalTests.csproj", "{A319ACCE-060B-4385-9534-9F2202F6180E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.TestSites", "test\ServerComparison.TestSites\ServerComparison.TestSites.csproj", "{030225D8-4EE8-47E5-B692-2A96B3B51A38}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{55694E45-5EDE-46F8-80AA-797DE5F8C5C3}" - ProjectSection(SolutionItems) = preProject - build\dependencies.props = build\dependencies.props - build\repo.props = build\repo.props - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A319ACCE-060B-4385-9534-9F2202F6180E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Release|Any CPU.Build.0 = Release|Any CPU - {030225D8-4EE8-47E5-B692-2A96B3B51A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {030225D8-4EE8-47E5-B692-2A96B3B51A38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {030225D8-4EE8-47E5-B692-2A96B3B51A38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {030225D8-4EE8-47E5-B692-2A96B3B51A38}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {A319ACCE-060B-4385-9534-9F2202F6180E} = {FA91F388-F4AF-4850-9D68-D4D128E6B1A6} - {030225D8-4EE8-47E5-B692-2A96B3B51A38} = {FA91F388-F4AF-4850-9D68-D4D128E6B1A6} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {8A313020-8407-494F-81D7-7631580C5FCC} - EndGlobalSection -EndGlobal diff --git a/src/ServerTests/build/dependencies.props b/src/ServerTests/build/dependencies.props deleted file mode 100644 index 72cad24822..0000000000 --- a/src/ServerTests/build/dependencies.props +++ /dev/null @@ -1,39 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.1.3-rtm-15802 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 0.5.1 - 2.1.2 - 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 - 1.4.0 - 3.2.0 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - diff --git a/src/ServerTests/build/repo.props b/src/ServerTests/build/repo.props deleted file mode 100644 index 96c1270585..0000000000 --- a/src/ServerTests/build/repo.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ServerTests/build/sources.props b/src/ServerTests/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/ServerTests/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/ServerTests/install-nginx.sh b/src/ServerTests/install-nginx.sh deleted file mode 100644 index 9564813c2d..0000000000 --- a/src/ServerTests/install-nginx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -curl -sSL http://nginx.org/download/nginx-1.8.0.tar.gz | tar zxfv - -C /tmp && cd /tmp/nginx-1.8.0/ -./configure --prefix=$HOME/nginxinstall --with-http_ssl_module -make -make install diff --git a/src/ServerTests/test/Directory.Build.props b/src/ServerTests/test/Directory.Build.props deleted file mode 100644 index 620b803d21..0000000000 --- a/src/ServerTests/test/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - netcoreapp2.1;netcoreapp2.0 - $(DeveloperBuildTestTfms) - $(StandardTestTfms);net461 - - diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/ServerTests/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj deleted file mode 100644 index ba0fea38e1..0000000000 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - netcoreapp2.1 - - - - - - - - - - - - - - - - - - - diff --git a/src/ServerTests/test/ServerComparison.TestSites/Properties/launchSettings.json b/src/ServerTests/test/ServerComparison.TestSites/Properties/launchSettings.json deleted file mode 100644 index 7e255d2086..0000000000 --- a/src/ServerTests/test/ServerComparison.TestSites/Properties/launchSettings.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:39982/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNET_ENVIRONMENT": "HelloWorld" - } - }, - "web": { - "commandName": "web", - "environmentVariables": { - "ASPNET_ENVIRONMENT": "HelloWorld" - } - } - } -} \ No newline at end of file diff --git a/src/ServerTests/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/ServerTests/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj deleted file mode 100644 index f3aa4898e5..0000000000 --- a/src/ServerTests/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - $(StandardTestTfms) - win7-x86;win7-x64;linux-x64;osx-x64 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ServerTests/version.props b/src/ServerTests/version.props deleted file mode 100644 index 669c874829..0000000000 --- a/src/ServerTests/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 2.1.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - diff --git a/src/Servers/FunctionalTests.sln b/src/Servers/FunctionalTests.sln new file mode 100644 index 0000000000..59d8df47dd --- /dev/null +++ b/src/Servers/FunctionalTests.sln @@ -0,0 +1,160 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "test\FunctionalTests\ServerComparison.FunctionalTests.csproj", "{78018310-02F8-4BB8-A8E2-E88AF7A7F51E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.TestSites", "testassets\TestSites\ServerComparison.TestSites.csproj", "{7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{25B4D0F2-96D1-4F34-896E-ABA1E803A230}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{C36232B5-48B5-4D9D-A357-17278265827E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "..\Http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{4507F026-2C82-4DD7-965B-BD28C9F0EAB4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCompression", "..\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj", "{4596F641-5AC2-4EC0-B7DD-998D1503D717}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj", "{831EA089-7072-41CF-996A-75A3EF39D31E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9DD063D3-CAE1-49C2-9C24-DE3499E79322}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|x64.ActiveCfg = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|x64.Build.0 = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|x86.ActiveCfg = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Debug|x86.Build.0 = Debug|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|Any CPU.Build.0 = Release|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|x64.ActiveCfg = Release|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|x64.Build.0 = Release|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|x86.ActiveCfg = Release|Any CPU + {78018310-02F8-4BB8-A8E2-E88AF7A7F51E}.Release|x86.Build.0 = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|x64.ActiveCfg = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|x64.Build.0 = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|x86.ActiveCfg = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Debug|x86.Build.0 = Debug|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|Any CPU.Build.0 = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|x64.ActiveCfg = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|x64.Build.0 = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|x86.ActiveCfg = Release|Any CPU + {7DC0D66D-0DA8-416E-A4AD-1B38D13597D9}.Release|x86.Build.0 = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|x64.ActiveCfg = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|x64.Build.0 = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|x86.ActiveCfg = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Debug|x86.Build.0 = Debug|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|Any CPU.Build.0 = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|x64.ActiveCfg = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|x64.Build.0 = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|x86.ActiveCfg = Release|Any CPU + {C36232B5-48B5-4D9D-A357-17278265827E}.Release|x86.Build.0 = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|x64.ActiveCfg = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|x64.Build.0 = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|x86.ActiveCfg = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Debug|x86.Build.0 = Debug|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|Any CPU.Build.0 = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|x64.ActiveCfg = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|x64.Build.0 = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|x86.ActiveCfg = Release|Any CPU + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4}.Release|x86.Build.0 = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|x64.ActiveCfg = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|x64.Build.0 = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|x86.ActiveCfg = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Debug|x86.Build.0 = Debug|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|Any CPU.Build.0 = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|x64.ActiveCfg = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|x64.Build.0 = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|x86.ActiveCfg = Release|Any CPU + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C}.Release|x86.Build.0 = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|x64.ActiveCfg = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|x64.Build.0 = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|x86.ActiveCfg = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Debug|x86.Build.0 = Debug|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|Any CPU.Build.0 = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|x64.ActiveCfg = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|x64.Build.0 = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|x86.ActiveCfg = Release|Any CPU + {4596F641-5AC2-4EC0-B7DD-998D1503D717}.Release|x86.Build.0 = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|x64.ActiveCfg = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|x64.Build.0 = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|x86.ActiveCfg = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Debug|x86.Build.0 = Debug|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|Any CPU.Build.0 = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|x64.ActiveCfg = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|x64.Build.0 = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|x86.ActiveCfg = Release|Any CPU + {831EA089-7072-41CF-996A-75A3EF39D31E}.Release|x86.Build.0 = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|x64.ActiveCfg = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|x64.Build.0 = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|x86.ActiveCfg = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Debug|x86.Build.0 = Debug|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|Any CPU.Build.0 = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|x64.ActiveCfg = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|x64.Build.0 = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|x86.ActiveCfg = Release|Any CPU + {9DD063D3-CAE1-49C2-9C24-DE3499E79322}.Release|x86.Build.0 = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|x64.ActiveCfg = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|x64.Build.0 = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|x86.ActiveCfg = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Debug|x86.Build.0 = Debug|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|Any CPU.Build.0 = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|x64.ActiveCfg = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|x64.Build.0 = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|x86.ActiveCfg = Release|Any CPU + {0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C36232B5-48B5-4D9D-A357-17278265827E} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {4507F026-2C82-4DD7-965B-BD28C9F0EAB4} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {837CCC8E-AC1E-4A4C-94EE-7AFE0987314C} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {4596F641-5AC2-4EC0-B7DD-998D1503D717} = {25B4D0F2-96D1-4F34-896E-ABA1E803A230} + {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} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F4D963C1-44FE-45AE-9B2A-11CD86C7539F} + EndGlobalSection +EndGlobal diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs index fc5ab5abef..94eacdc098 100644 --- a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] + [Fact] public Task HelloWorld_IISExpress_Clr_X64_Portable() { return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, "V1"); diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index a643a15bcb..8f4d0d1a63 100644 --- a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] + [Fact] public Task NtlmAuthentication_Clr_X64_Portable() { return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051, "V1"); diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/HelloWorldTest.cs b/src/Servers/test/FunctionalTests/HelloWorldTest.cs similarity index 87% rename from src/ServerTests/test/ServerComparison.FunctionalTests/HelloWorldTest.cs rename to src/Servers/test/FunctionalTests/HelloWorldTest.cs index 62e1fcfbd8..9b65060868 100644 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/HelloWorldTest.cs +++ b/src/Servers/test/FunctionalTests/HelloWorldTest.cs @@ -32,9 +32,7 @@ namespace ServerComparison.FunctionalTests [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] public Task HelloWorld_IISExpress(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { return HelloWorld(ServerType.IISExpress, runtimeFlavor, RuntimeArchitecture.x64, applicationType, hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); @@ -66,11 +64,11 @@ namespace ServerComparison.FunctionalTests } - private async Task HelloWorld(ServerType serverType, - RuntimeFlavor runtimeFlavor, - RuntimeArchitecture architecture, - ApplicationType applicationType, - [CallerMemberName] string testName = null, + private async Task HelloWorld(ServerType serverType, + RuntimeFlavor runtimeFlavor, + RuntimeArchitecture architecture, + ApplicationType applicationType, + [CallerMemberName] string testName = null, HostingModel hostingModel = HostingModel.OutOfProcess, string additionalPublishParameters = "") { @@ -79,7 +77,7 @@ namespace ServerComparison.FunctionalTests { var logger = loggerFactory.CreateLogger("HelloWorld"); - var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(), serverType, runtimeFlavor, architecture) { EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld', ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "Http.config", "nginx.conf"), diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/Helpers.cs b/src/Servers/test/FunctionalTests/Helpers.cs similarity index 89% rename from src/ServerTests/test/ServerComparison.FunctionalTests/Helpers.cs rename to src/Servers/test/FunctionalTests/Helpers.cs index 0c4c4ab89d..36864d684c 100644 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/Helpers.cs +++ b/src/Servers/test/FunctionalTests/Helpers.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -9,17 +9,17 @@ namespace ServerComparison.FunctionalTests { public class Helpers { - public static string GetApplicationPath(ApplicationType applicationType) + public static string GetApplicationPath() { var applicationBasePath = AppContext.BaseDirectory; var directoryInfo = new DirectoryInfo(applicationBasePath); do { - var solutionFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, "ServerTests.sln")); + var solutionFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, "FunctionalTests.sln")); if (solutionFileInfo.Exists) { - return Path.GetFullPath(Path.Combine(directoryInfo.FullName, "test", "ServerComparison.TestSites")); + return Path.GetFullPath(Path.Combine(directoryInfo.FullName, "testassets", "TestSites")); } directoryInfo = directoryInfo.Parent; @@ -66,4 +66,4 @@ namespace ServerComparison.FunctionalTests throw new ArgumentException($"Unknown RuntimeFlavor '{runtimeFlavor}'"); } } -} \ No newline at end of file +} diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/Http.config b/src/Servers/test/FunctionalTests/Http.config similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/Http.config rename to src/Servers/test/FunctionalTests/Http.config diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/NoCompression.conf b/src/Servers/test/FunctionalTests/NoCompression.conf similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/NoCompression.conf rename to src/Servers/test/FunctionalTests/NoCompression.conf diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/NoCompression.config b/src/Servers/test/FunctionalTests/NoCompression.config similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/NoCompression.config rename to src/Servers/test/FunctionalTests/NoCompression.config diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthentication.config b/src/Servers/test/FunctionalTests/NtlmAuthentication.config similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthentication.config rename to src/Servers/test/FunctionalTests/NtlmAuthentication.config diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs b/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs similarity index 85% rename from src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs rename to src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs index 0aff3407db..4050625d76 100644 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs +++ b/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs @@ -22,13 +22,8 @@ namespace ServerComparison.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [InlineData(ServerType.IISExpress, RuntimeFlavor.Clr, "net461", RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "V2", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, "netcoreapp2.0", RuntimeArchitecture.x64, ApplicationType.Portable)] @@ -37,7 +32,7 @@ namespace ServerComparison.FunctionalTests [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, "netcoreapp2.1", RuntimeArchitecture.x64, ApplicationType.Standalone)] public async Task NtlmAuthentication(ServerType serverType, RuntimeFlavor runtimeFlavor, - string targetFramework, + string targetFramework, RuntimeArchitecture architecture, ApplicationType applicationType, HostingModel hostingModel = HostingModel.OutOfProcess, @@ -48,7 +43,7 @@ namespace ServerComparison.FunctionalTests { var logger = loggerFactory.CreateLogger("NtlmAuthenticationTest"); - var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(), serverType, runtimeFlavor, architecture) { EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication' ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "NtlmAuthentication.config", nginxConfig: null), diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/test/FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/Properties/AssemblyInfo.cs rename to src/Servers/test/FunctionalTests/Properties/AssemblyInfo.cs diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs similarity index 79% rename from src/ServerTests/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs rename to src/Servers/test/FunctionalTests/ResponseCompressionTests.cs index 301a0b74e6..b0e8d7cb9b 100644 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs +++ b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs @@ -34,82 +34,70 @@ namespace ServerComparison.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] public Task ResponseCompression_IISExpress_NoCompression(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { - return ResponseCompression(ServerType.IISExpress, - runtimeFlavor, - RuntimeArchitecture.x64, - CheckNoCompressionAsync, + return ResponseCompression(ServerType.IISExpress, + runtimeFlavor, + RuntimeArchitecture.x64, + CheckNoCompressionAsync, applicationType, - hostCompression: false, - hostingModel: hostingModel, + hostCompression: false, + hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); } [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] public Task ResponseCompression_IISExpress_HostCompression(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { - return ResponseCompression(ServerType.IISExpress, - runtimeFlavor, - RuntimeArchitecture.x64, - CheckHostCompressionAsync, + return ResponseCompression(ServerType.IISExpress, + runtimeFlavor, + RuntimeArchitecture.x64, + CheckHostCompressionAsync, applicationType, - hostCompression: true, - hostingModel: hostingModel, + hostCompression: true, + hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); } - [ConditionalTheory(Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - public Task ResponseCompression_IISExpress_AppCompression(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) - { - return ResponseCompression(ServerType.IISExpress, - runtimeFlavor, - RuntimeArchitecture.x64, - CheckAppCompressionAsync, - applicationType, - hostCompression: true, - hostingModel: hostingModel, - additionalPublishParameters: additionalPublishParameters); - } - - [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] + public Task ResponseCompression_IISExpress_AppCompression(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) + { + return ResponseCompression(ServerType.IISExpress, + runtimeFlavor, + RuntimeArchitecture.x64, + CheckAppCompressionAsync, + applicationType, + hostCompression: true, + hostingModel: hostingModel, + additionalPublishParameters: additionalPublishParameters); + } + + + [ConditionalTheory] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] + [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] public Task ResponseCompression_IISExpress_AppAndHostCompression(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { - return ResponseCompression(ServerType.IISExpress, - runtimeFlavor, - RuntimeArchitecture.x64, - CheckAppCompressionAsync, + return ResponseCompression(ServerType.IISExpress, + runtimeFlavor, + RuntimeArchitecture.x64, + CheckAppCompressionAsync, applicationType, - hostCompression: true, - hostingModel: hostingModel, - additionalPublishParameters: additionalPublishParameters); + hostCompression: true, + hostingModel: hostingModel, + additionalPublishParameters: additionalPublishParameters); } // WebListener @@ -135,7 +123,7 @@ namespace ServerComparison.FunctionalTests { return ResponseCompression(ServerType.WebListener, runtimeFlavor, RuntimeArchitecture.x64, CheckAppCompressionAsync, applicationType, hostCompression: false); } - + [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable)] @@ -162,7 +150,7 @@ namespace ServerComparison.FunctionalTests { return ResponseCompression(serverType, runtimeFlavor, architecture, CheckAppCompressionAsync, applicationType, hostCompression: false); } - + // Nginx [ConditionalTheory] [OSSkipCondition(OperatingSystems.Windows)] @@ -201,11 +189,11 @@ namespace ServerComparison.FunctionalTests } private async Task ResponseCompression(ServerType serverType, - RuntimeFlavor runtimeFlavor, - RuntimeArchitecture architecture, - Func scenario, - ApplicationType applicationType, - bool hostCompression, + RuntimeFlavor runtimeFlavor, + RuntimeArchitecture architecture, + Func scenario, + ApplicationType applicationType, + bool hostCompression, [CallerMemberName] string testName = null, HostingModel hostingModel = HostingModel.OutOfProcess, string additionalPublishParameters = "") @@ -215,7 +203,7 @@ namespace ServerComparison.FunctionalTests { var logger = loggerFactory.CreateLogger("ResponseCompression"); - var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(), serverType, runtimeFlavor, architecture) { EnvironmentName = "ResponseCompression", ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/ResponseTests.cs b/src/Servers/test/FunctionalTests/ResponseTests.cs similarity index 93% rename from src/ServerTests/test/ServerComparison.FunctionalTests/ResponseTests.cs rename to src/Servers/test/FunctionalTests/ResponseTests.cs index 62d7fec6e3..ad616310b8 100644 --- a/src/ServerTests/test/ServerComparison.FunctionalTests/ResponseTests.cs +++ b/src/Servers/test/FunctionalTests/ResponseTests.cs @@ -27,11 +27,9 @@ namespace ServerComparison.FunctionalTests // IIS Express [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] public Task ResponseFormats_IISExpress_ContentLength(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { return ResponseFormats(ServerType.IISExpress, runtimeFlavor, RuntimeArchitecture.x64, CheckContentLengthAsync, applicationType, hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); @@ -39,11 +37,9 @@ namespace ServerComparison.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] public Task ResponseFormats_IISExpress_Chunked(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { return ResponseFormats(ServerType.IISExpress, runtimeFlavor, RuntimeArchitecture.x64, CheckChunkedAsync, applicationType, hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); @@ -51,16 +47,14 @@ namespace ServerComparison.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "", Skip = "Websdk issue with full framework publish. See https://github.com/aspnet/websdk/pull/322")] + [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable, HostingModel.OutOfProcess, "")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V1")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] - [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone, HostingModel.OutOfProcess, "/p:ANCMVersion=V2")] public Task ResponseFormats_IIS_ManuallyChunk(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, HostingModel hostingModel, string additionalPublishParameters) { return ResponseFormats(ServerType.IISExpress, runtimeFlavor, RuntimeArchitecture.x64, CheckManuallyChunkedAsync, applicationType, hostingModel: hostingModel, additionalPublishParameters: additionalPublishParameters); } - + // Weblistener [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] @@ -104,7 +98,7 @@ namespace ServerComparison.FunctionalTests return ResponseFormats(ServerType.WebListener, runtimeFlavor, RuntimeArchitecture.x64, CheckHttp11ConnectionCloseAsync, applicationType); } - + [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InlineData(RuntimeFlavor.Clr, ApplicationType.Portable)] @@ -149,7 +143,7 @@ namespace ServerComparison.FunctionalTests { return ResponseFormats(ServerType.Kestrel, runtimeFlavor, RuntimeArchitecture.x64, CheckHttp11ConnectionCloseAsync, applicationType); } - + [Theory] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone)] @@ -157,7 +151,7 @@ namespace ServerComparison.FunctionalTests { return ResponseFormats(ServerType.Kestrel, runtimeFlavor, RuntimeArchitecture.x64, CheckChunkedAsync, applicationType); } - + [Theory] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone)] @@ -174,7 +168,7 @@ namespace ServerComparison.FunctionalTests return ResponseFormats(ServerType.Kestrel, runtimeFlavor, RuntimeArchitecture.x64, CheckManuallyChunkedAndCloseAsync, applicationType); } - // Nginx + // Nginx [ConditionalTheory] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable)] @@ -204,11 +198,11 @@ namespace ServerComparison.FunctionalTests return ResponseFormats(ServerType.Nginx, runtimeFlavor, RuntimeArchitecture.x64, CheckManuallyChunkedAsync, applicationType); } - private async Task ResponseFormats(ServerType serverType, - RuntimeFlavor runtimeFlavor, + private async Task ResponseFormats(ServerType serverType, + RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, - Func scenario, - ApplicationType applicationType, + Func scenario, + ApplicationType applicationType, [CallerMemberName] string testName = null, HostingModel hostingModel = HostingModel.OutOfProcess, string additionalPublishParameters = "") @@ -218,7 +212,7 @@ namespace ServerComparison.FunctionalTests { var logger = loggerFactory.CreateLogger("ResponseFormats"); - var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(), serverType, runtimeFlavor, architecture) { EnvironmentName = "Responses", ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "Http.config", "nginx.conf"), diff --git a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj new file mode 100644 index 0000000000..0ba6d8dd9b --- /dev/null +++ b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -0,0 +1,26 @@ + + + + + netcoreapp2.1 + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ServerTests/test/ServerComparison.FunctionalTests/nginx.conf b/src/Servers/test/FunctionalTests/nginx.conf similarity index 100% rename from src/ServerTests/test/ServerComparison.FunctionalTests/nginx.conf rename to src/Servers/test/FunctionalTests/nginx.conf diff --git a/src/ServerTests/test/ServerComparison.TestSites/Program.cs b/src/Servers/testassets/TestSites/Program.cs similarity index 99% rename from src/ServerTests/test/ServerComparison.TestSites/Program.cs rename to src/Servers/testassets/TestSites/Program.cs index f6ae1163c1..af292d5d78 100644 --- a/src/ServerTests/test/ServerComparison.TestSites/Program.cs +++ b/src/Servers/testassets/TestSites/Program.cs @@ -53,7 +53,7 @@ namespace ServerComparison.TestSites // Check that we are not using IIS inproc before we add Kestrel. builder.UseKestrel(); } - + builder.UseIISIntegration(); var host = builder.Build(); diff --git a/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj new file mode 100644 index 0000000000..759a75b222 --- /dev/null +++ b/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj @@ -0,0 +1,24 @@ + + + + netcoreapp2.1;netcoreapp2.0;net461 + win7-x86;win7-x64;linux-x64;osx-x64 + + + + + + + + + + + + + + + + + + + diff --git a/src/ServerTests/test/ServerComparison.TestSites/StartupHelloWorld.cs b/src/Servers/testassets/TestSites/StartupHelloWorld.cs similarity index 100% rename from src/ServerTests/test/ServerComparison.TestSites/StartupHelloWorld.cs rename to src/Servers/testassets/TestSites/StartupHelloWorld.cs diff --git a/src/ServerTests/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs b/src/Servers/testassets/TestSites/StartupNtlmAuthentication.cs similarity index 100% rename from src/ServerTests/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs rename to src/Servers/testassets/TestSites/StartupNtlmAuthentication.cs diff --git a/src/ServerTests/test/ServerComparison.TestSites/StartupResponseCompression.cs b/src/Servers/testassets/TestSites/StartupResponseCompression.cs similarity index 100% rename from src/ServerTests/test/ServerComparison.TestSites/StartupResponseCompression.cs rename to src/Servers/testassets/TestSites/StartupResponseCompression.cs diff --git a/src/ServerTests/test/ServerComparison.TestSites/StartupResponses.cs b/src/Servers/testassets/TestSites/StartupResponses.cs similarity index 100% rename from src/ServerTests/test/ServerComparison.TestSites/StartupResponses.cs rename to src/Servers/testassets/TestSites/StartupResponses.cs diff --git a/src/ServerTests/test/ServerComparison.TestSites/web.config b/src/Servers/testassets/TestSites/web.config similarity index 100% rename from src/ServerTests/test/ServerComparison.TestSites/web.config rename to src/Servers/testassets/TestSites/web.config From 686ce02cc810cffc1559dc2eed4f1bb8bf77874c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 20 Dec 2018 10:53:42 -0800 Subject: [PATCH 03/80] Remove code for building an analyzers package that never shipped (#6053) Microsoft.AspNetCore.Analyzers didn't ship in 2.1, and we don't have plans to every ship it in a 2.1.x release. --- build/SharedFx.targets | 9 --------- build/artifacts.props | 6 +----- ...spNetCore.Mvc.Analyzers.Experimental.csproj | 8 ++------ .../Microsoft.AspNetCore.Analyzers.csproj | 18 ------------------ 4 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 src/Packages/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj diff --git a/build/SharedFx.targets b/build/SharedFx.targets index d75fbdee83..828b62606e 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -9,7 +9,6 @@ <_MetapackageProject Include="$(RepositoryRoot)src\Packages\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj" /> <_MetapackageProject Include="$(RepositoryRoot)src\Packages\Microsoft.AspNetCore.App\Microsoft.AspNetCore.App.csproj" /> - <_MetapackageProject Include="$(RepositoryRoot)src\Packages\Microsoft.AspNetCore.Analyzers\Microsoft.AspNetCore.Analyzers.csproj" /> - - <_MetapackageBuilderProject Include="$(MSBuildProjectFullPath)"> - - MetapackageName=Microsoft.AspNetCore.Analyzers; - MetapackageReferenceType=Analyzer; - MetapackageDependencyVersionRangeType=Minimum - - false false - - false + false netstandard1.3 false false diff --git a/src/Packages/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj b/src/Packages/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj deleted file mode 100644 index a9f9071719..0000000000 --- a/src/Packages/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - false - false - netstandard2.0 - aspnetcore - Microsoft.AspNetCore.Analyzers - - $(ExperimentalVersionPrefix) - $(ExperimentalVersionSuffix) - $(ExperimentalPackageVersion) - false - - false - - - From efe9b95b14442f336519cf31c8649b0a658292ae Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 20 Dec 2018 12:21:30 -0800 Subject: [PATCH 04/80] Improve cdn test reliability (#6044) --- .../Identity.Test/CdnScriptTaghelperTests.cs | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs b/src/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs index b9a65a320c..d9a6e57929 100644 --- a/src/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs +++ b/src/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs @@ -7,6 +7,7 @@ using System.IO; using System.Net.Http; using System.Security.Cryptography; using System.Text.RegularExpressions; +using System.Threading; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -38,7 +39,7 @@ namespace Microsoft.AspNetCore.Identity.Test Assert.NotEmpty(scriptTags); var shasum = new Dictionary(StringComparer.OrdinalIgnoreCase); - using (var client = new HttpClient()) + using (var client = new HttpClient(new RetryHandler(new HttpClientHandler() { }))) { foreach (var script in scriptTags) { @@ -62,6 +63,25 @@ namespace Microsoft.AspNetCore.Identity.Test }); } + class RetryHandler : DelegatingHandler + { + public RetryHandler(HttpMessageHandler innerHandler) : base(innerHandler) { } + protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) + { + HttpResponseMessage result = null; + for (var i = 0; i < 10; i++) + { + result = await base.SendAsync(request, cancellationToken); + if (result.IsSuccessStatusCode) + { + return result; + } + await Task.Delay(1000); + } + return result; + } + } + private struct ScriptTag { public string Src; From 7f17d095d824d5f69382f7b05f514a95b13cc970 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Thu, 20 Dec 2018 16:27:32 -0800 Subject: [PATCH 05/80] Convert Mvc to use Reference (#6047) * Convert Mvc to use Reference * Use ProjectReference for test assets --- build/buildorder.props | 1 - build/dependencies.props | 7 + build/repo.props | 1 + build/submodules.props | 1 - eng/Baseline.Designer.props | 174 ++++++++++++++++++ eng/Baseline.xml | 16 ++ eng/Dependencies.props | 5 + eng/ProjectReferences.props | 19 ++ eng/targets/Packaging.targets | 12 ++ eng/targets/ResolveReferences.targets | 2 +- src/Mvc/.gitignore | 43 ----- src/Mvc/Directory.Build.props | 22 --- src/Mvc/Directory.Build.targets | 6 - src/Mvc/NuGetPackageVerifier.json | 7 - ...icrosoft.AspNetCore.Mvc.Performance.csproj | 9 +- src/Mvc/build/dependencies.props | 96 ---------- src/Mvc/build/repo.props | 17 -- src/Mvc/build/sources.props | 17 -- src/Mvc/samples/MvcSandbox/MvcSandbox.csproj | 17 +- src/Mvc/src/Directory.Build.props | 7 - ...crosoft.AspNetCore.Mvc.Abstractions.csproj | 6 +- ...pNetCore.Mvc.Analyzers.Experimental.csproj | 2 +- .../Microsoft.AspNetCore.Mvc.Analyzers.csproj | 2 +- ...icrosoft.AspNetCore.Mvc.ApiExplorer.csproj | 4 +- .../Microsoft.AspNetCore.Mvc.Core.csproj | 36 ++-- .../Microsoft.AspNetCore.Mvc.Cors.csproj | 4 +- ...soft.AspNetCore.Mvc.DataAnnotations.csproj | 6 +- ...soft.AspNetCore.Mvc.Formatters.Json.csproj | 4 +- ...osoft.AspNetCore.Mvc.Formatters.Xml.csproj | 2 +- ...crosoft.AspNetCore.Mvc.Localization.csproj | 8 +- .../Microsoft.AspNetCore.Mvc.Razor.csproj | 29 ++- ...Microsoft.AspNetCore.Mvc.RazorPages.csproj | 4 +- ...Microsoft.AspNetCore.Mvc.TagHelpers.csproj | 12 +- .../Microsoft.AspNetCore.Mvc.Testing.csproj | 4 +- ...crosoft.AspNetCore.Mvc.ViewFeatures.csproj | 20 +- ...oft.AspNetCore.Mvc.WebApiCompatShim.csproj | 8 +- .../Microsoft.AspNetCore.Mvc.csproj | 23 +-- src/Mvc/test/Directory.Build.props | 11 +- ...ft.AspNetCore.Mvc.Abstractions.Test.csproj | 6 +- ...ore.Mvc.Analyzers.Experimental.Test.csproj | 9 +- ...osoft.AspNetCore.Mvc.Analyzers.Test.csproj | 8 +- ...oft.AspNetCore.Mvc.ApiExplorer.Test.csproj | 4 +- .../Microsoft.AspNetCore.Mvc.Core.Test.csproj | 16 +- .../Microsoft.AspNetCore.Mvc.Cors.Test.csproj | 8 +- ...AspNetCore.Mvc.DataAnnotations.Test.csproj | 8 +- ...AspNetCore.Mvc.Formatters.Json.Test.csproj | 7 +- ....AspNetCore.Mvc.Formatters.Xml.Test.csproj | 6 +- ...soft.AspNetCore.Mvc.FunctionalTests.csproj | 14 +- ...oft.AspNetCore.Mvc.IntegrationTests.csproj | 8 +- ...ft.AspNetCore.Mvc.Localization.Test.csproj | 6 +- ...Microsoft.AspNetCore.Mvc.Razor.Test.csproj | 12 +- ...soft.AspNetCore.Mvc.RazorPages.Test.csproj | 12 +- ...soft.AspNetCore.Mvc.TagHelpers.Test.csproj | 14 +- .../Microsoft.AspNetCore.Mvc.Test.csproj | 10 +- ...Microsoft.AspNetCore.Mvc.TestCommon.csproj | 19 +- ...pNetCore.Mvc.TestDiagnosticListener.csproj | 4 +- ...ft.AspNetCore.Mvc.ViewFeatures.Test.csproj | 10 +- ...AspNetCore.Mvc.WebApiCompatShimTest.csproj | 10 +- .../ApiExplorerWebSite.csproj | 11 +- .../ApplicationModelWebSite.csproj | 9 +- .../WebSites/BasicWebSite/BasicWebSite.csproj | 21 ++- ...ControllersFromServicesClassLibrary.csproj | 3 +- .../ControllersFromServicesWebSite.csproj | 11 +- .../WebSites/CorsWebSite/CorsWebSite.csproj | 13 +- src/Mvc/test/WebSites/Directory.Build.props | 2 +- .../ErrorPageMiddlewareWebSite.csproj | 11 +- .../FSharpWebSite/FSharpWebSite.fsproj | 12 +- .../WebSites/FilesWebSite/FilesWebSite.csproj | 11 +- .../FormatterWebSite/FormatterWebSite.csproj | 11 +- .../HtmlGenerationWebSite.csproj | 9 +- .../RazorBuildWebSite.PrecompiledViews.csproj | 5 +- .../RazorBuildWebSite.Views.csproj | 5 +- .../RazorBuildWebSite.csproj | 13 +- ...PageExecutionInstrumentationWebSite.csproj | 11 +- .../RazorPagesClassLibrary.csproj | 7 +- .../RazorPagesWebSite.csproj | 11 +- .../WebSites/RazorWebSite/RazorWebSite.csproj | 13 +- .../RoutingWebSite/RoutingWebSite.csproj | 9 +- .../SecurityWebSite/SecurityWebSite.csproj | 11 +- .../SimpleWebSite/SimpleWebSite.csproj | 7 +- .../TagHelpersWebSite.csproj | 9 +- .../VersioningWebSite.csproj | 9 +- .../WebApiCompatShimWebSite.csproj | 11 +- .../XmlFormattersWebSite.csproj | 11 +- src/Mvc/version.props | 21 --- 85 files changed, 579 insertions(+), 553 deletions(-) delete mode 100644 src/Mvc/.gitignore delete mode 100644 src/Mvc/Directory.Build.props delete mode 100644 src/Mvc/Directory.Build.targets delete mode 100644 src/Mvc/NuGetPackageVerifier.json delete mode 100644 src/Mvc/build/dependencies.props delete mode 100644 src/Mvc/build/repo.props delete mode 100644 src/Mvc/build/sources.props delete mode 100644 src/Mvc/src/Directory.Build.props delete mode 100644 src/Mvc/version.props diff --git a/build/buildorder.props b/build/buildorder.props index 5a71a5701c..74e3caa853 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -8,7 +8,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index c46766b7af..5a3b3c442c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -79,6 +79,13 @@ 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 diff --git a/build/repo.props b/build/repo.props index c093551d2b..d7f3bc5693 100644 --- a/build/repo.props +++ b/build/repo.props @@ -81,6 +81,7 @@ $(RepositoryRoot)src\Tools\**\*.*proj; $(RepositoryRoot)src\Middleware\**\*.*proj; $(RepositoryRoot)src\Razor\**\*.*proj; + $(RepositoryRoot)src\Mvc\**\*.*proj; " Exclude=" @(ProjectToExclude); diff --git a/build/submodules.props b/build/submodules.props index 01c2e2ed0d..45210f9217 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -51,7 +51,6 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 4ea2a77ec1..c418f92be1 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -459,6 +459,162 @@ + + + 2.1.3 + + + + + + + + 2.1.3 + + + + + 2.1.3 + + + + + + + 2.1.3 + + + + + + + + + + + + + + + + + + + + 2.1.3 + + + + + + + + 2.1.3 + + + + + + + + + 2.1.3 + + + + + + + + 2.1.3 + + + + + + + 2.1.3 + + + + + + + + + + 2.1.3 + + + + + + + + + + + + + + + + + + + + + + + 2.1.3 + + + + + + + 2.1.3 + + + + + + + + + + + + 2.1.3 + + + + + + + + 2.1.3 + + + + + + + + + + + + + + 2.1.3 + + + + + + + 2.1.2 @@ -471,6 +627,24 @@ + + + 2.1.3 + + + + + + + + + + + + + + + 2.1.1 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 85f08dbe5e..ae2c6a254c 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -56,7 +56,23 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + + + + + + + + + + + + + + + + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index ac07dce98c..bf7171f343 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -29,6 +29,7 @@ and are generated based on the last package release. + @@ -46,6 +47,7 @@ and are generated based on the last package release. + @@ -59,7 +61,9 @@ and are generated based on the last package release. + + @@ -82,6 +86,7 @@ and are generated based on the last package release. + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index c72b620aa1..e50fe72bcb 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -95,5 +95,24 @@ + + + + + + + + + + + + + + + + + + + diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index 244f2c3ab7..ebb1ca541a 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -27,4 +27,16 @@ + + + + + <_ProjectPathWithVersion Include="$(MSBuildProjectFullPath)"> + $(MSBuildProjectName) + $(PackageVersion) + + + + diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 3c55bf6f8f..c3d8cebbcb 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -85,7 +85,7 @@ <_ReferenceTemp Remove="@(_ReferenceTemp)" /> - + - - 0.9.9 - 0.10.13 - 2.1.3-rtm-15802 - 5.2.6 - 2.8.0 - 2.8.0 - 1.7.0 - 2.1.0 - 2.0.0 - 2.1.2 - 2.1.1 - 15.6.1 - 4.7.49 - 2.0.3 - 1.0.1 - 4.5.0 - 4.5.0 - 4.5.1 - 0.8.0 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - 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.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.1.1 - 2.1.2 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.0 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.0 - 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.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - - diff --git a/src/Mvc/build/repo.props b/src/Mvc/build/repo.props deleted file mode 100644 index d672599d6a..0000000000 --- a/src/Mvc/build/repo.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - true - - - - - - - - - - - - diff --git a/src/Mvc/build/sources.props b/src/Mvc/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/Mvc/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/Mvc/samples/MvcSandbox/MvcSandbox.csproj b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj index 116e4a2f66..21814517a3 100644 --- a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj +++ b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj @@ -10,18 +10,17 @@ - + - + - - - - - - - + + + + + + diff --git a/src/Mvc/src/Directory.Build.props b/src/Mvc/src/Directory.Build.props deleted file mode 100644 index 4b89a431e7..0000000000 --- a/src/Mvc/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj index 41cfcba32b..9fc6e08ada 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj @@ -17,9 +17,9 @@ Microsoft.AspNetCore.Mvc.IActionResult - - - + + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj index 085b0ca0e3..fdbb59ea35 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj index 310c88685a..69db971484 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj index 0e6afbe939..61ded75817 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj @@ -14,9 +14,9 @@ - + - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj index a54324689b..86bf66eef4 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj @@ -26,25 +26,25 @@ Microsoft.AspNetCore.Mvc.RouteAttribute - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj index f6056e62e5..1ef6f1f061 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj @@ -9,9 +9,9 @@ - + - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj index 542474780e..b618acd532 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj @@ -14,9 +14,9 @@ - + - - + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj index c57c948d9e..8a88bf31f3 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj @@ -13,8 +13,8 @@ - + - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj index ebcf792899..4829840893 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj @@ -14,6 +14,6 @@ - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj index c8d53a4da1..82b7691b9f 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj @@ -16,11 +16,11 @@ Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer - + - - - + + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj index 2679f72275..438e9ef5ef 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -17,19 +17,38 @@ - + - - - - + + + + + + + true diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj index fd59e58282..49a49868d8 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj @@ -16,9 +16,9 @@ - + - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj index c77fa2c2b4..1cd35a40b1 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj @@ -14,13 +14,13 @@ - + - - - - - + + + + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj index cf0a443e19..8ad5b1a6e2 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj @@ -9,11 +9,11 @@ - + - + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index 1de4dbbd81..a952584c04 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -23,17 +23,17 @@ Microsoft.AspNetCore.Mvc.ViewComponent - - - + + + - - - - - - - + + + + + + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj index a40f7a0d15..686e3eaaa5 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj @@ -15,11 +15,11 @@ System.Web.Http.ApiController - - + + - - + + diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj index 76c448b86b..11964b7926 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + @@ -26,8 +26,9 @@ None - - + + + diff --git a/src/Mvc/test/Directory.Build.props b/src/Mvc/test/Directory.Build.props index ece617ffe1..c363930561 100644 --- a/src/Mvc/test/Directory.Build.props +++ b/src/Mvc/test/Directory.Build.props @@ -1,5 +1,5 @@ - + netcoreapp2.1 @@ -13,13 +13,4 @@ xUnit1026:$(WarningsNotAsErrors) $(MSBuildThisFileDirectory)MvcTests.ruleset - - - - - - - - - diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj index 1ca6c1dee7..7b11807ffd 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj @@ -5,10 +5,8 @@ - - - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj index b5d9571c75..8545746c70 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -11,10 +11,9 @@ - - - - + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj index 53db6da506..57a922a134 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj @@ -10,11 +10,9 @@ - - - - - + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj index 7a812822b1..7582aec310 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj @@ -5,7 +5,7 @@ - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj index 25368d8cc0..ac40695c6b 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj @@ -10,14 +10,14 @@ - - - + + + - - - - - + + + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj index f73ee9967c..63f4c2fd11 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj @@ -5,11 +5,11 @@ - - + + - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj index 84e189a38e..ce064070e7 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj @@ -5,11 +5,11 @@ - + - - - + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj index 4ace996ce7..6d91a68f77 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj @@ -5,11 +5,10 @@ - + - - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj index a02cf7ca47..ed8c1d3b24 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj @@ -5,10 +5,10 @@ - + - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index 6fce319b2a..d7d4b0fc0e 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -29,7 +29,7 @@ - + @@ -53,11 +53,11 @@ - - - - - - + + + + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj index 8e52e2a34f..ce1f9e74c5 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj @@ -5,11 +5,11 @@ - - + + - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj index 1ca6c1dee7..7b11807ffd 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj @@ -5,10 +5,8 @@ - - - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj index fbafa2be5f..5b9bcbbf4a 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj @@ -12,13 +12,13 @@ - - - + + + - - - + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj index 26a80f2c7a..2636b0b65d 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj @@ -5,13 +5,13 @@ - - - + + + - - - + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj index d9c1634c3c..03374ae290 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj @@ -5,13 +5,15 @@ - - + + - - - - + + + + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj index 90beaff56b..429926a3ed 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj @@ -5,11 +5,11 @@ - - + + - - - + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj index 203c301faa..24c903d96b 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj @@ -2,22 +2,25 @@ $(StandardTestTfms) + true + true - - + + - + - - - - - + + + + + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj index 23a77e17a1..61b3336711 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj @@ -2,9 +2,11 @@ $(StandardTestTfms) + true + true - + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj index f3dea58d26..1484b08a91 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj @@ -5,11 +5,11 @@ - - - + + + - - + + diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj index b10e11d8e7..ff02b34852 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj @@ -4,15 +4,15 @@ $(StandardTestTfms) true true + true - - + + - - - + + diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj index 239ce99f78..d05aa847d8 100644 --- a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj +++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj @@ -2,14 +2,15 @@ $(StandardTestWebsiteTfms) + true - - + + - - - + + + diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj index cfda2f9c35..17fa586476 100644 --- a/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj +++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj @@ -2,13 +2,14 @@ $(StandardTestWebsiteTfms) + true - + - - - + + + diff --git a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj index 55879651a0..66fb0d1df5 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj +++ b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj @@ -2,19 +2,20 @@ $(StandardTestWebsiteTfms) + true - - + + - - - - - - - - + + + + + + + + diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj index 8d0ce3d813..e631ded388 100644 --- a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj +++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj @@ -3,9 +3,10 @@ $(StandardTestWebsiteTfms) true + true - + diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj index 24bd4fa3f8..2e5ef45199 100644 --- a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj +++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj @@ -2,15 +2,16 @@ $(StandardTestWebsiteTfms) + true - + - - - - + + + + diff --git a/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj b/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj index 7cb00b8351..3361268a60 100644 --- a/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj +++ b/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj @@ -2,15 +2,16 @@ $(StandardTestWebsiteTfms) + true - - + + - - - - + + + + diff --git a/src/Mvc/test/WebSites/Directory.Build.props b/src/Mvc/test/WebSites/Directory.Build.props index ed8c546e2a..6487d6a43e 100644 --- a/src/Mvc/test/WebSites/Directory.Build.props +++ b/src/Mvc/test/WebSites/Directory.Build.props @@ -1,6 +1,6 @@ - + netcoreapp2.1 diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj index 52dc3bc28e..c34f7d787c 100644 --- a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj +++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj @@ -5,14 +5,15 @@ full false + true - + - - - - + + + + diff --git a/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj index 357a7fb863..7ef6adc56d 100644 --- a/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj +++ b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj @@ -2,6 +2,8 @@ $(StandardTestWebsiteTfms) + false + true @@ -11,12 +13,12 @@ - + - - - - + + + + diff --git a/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj index c8f6df1d20..e058430689 100644 --- a/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj +++ b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj @@ -2,6 +2,7 @@ $(StandardTestWebsiteTfms) + true @@ -10,11 +11,11 @@ - + - - - - + + + + diff --git a/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj index 239ce99f78..d05aa847d8 100644 --- a/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj +++ b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj @@ -2,14 +2,15 @@ $(StandardTestWebsiteTfms) + true - - + + - - - + + + diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj index cfda2f9c35..17fa586476 100644 --- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj +++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj @@ -2,13 +2,14 @@ $(StandardTestWebsiteTfms) + true - + - - - + + + diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj index 73549c2142..5852d7d33c 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj @@ -1,12 +1,13 @@ - + $(StandardTestWebsiteTfms) $(DefineConstants) + true - + diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj index 73549c2142..5852d7d33c 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj @@ -1,12 +1,13 @@ - + $(StandardTestWebsiteTfms) $(DefineConstants) + true - + diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj index ecf6d47b77..40e5f7fe2e 100644 --- a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj @@ -1,23 +1,24 @@ - + $(StandardTestWebsiteTfms) $(DefineConstants) false + true - + - - - - + + + + false + true - - - + diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj index 3d83f2342f..fe22bad303 100644 --- a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj @@ -2,15 +2,16 @@ $(StandardTestWebsiteTfms) + true - + - - - - + + + + diff --git a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj index 4c8140635e..ea8f3aa271 100644 --- a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj +++ b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj @@ -3,6 +3,7 @@ $(StandardTestWebsiteTfms) $(DefineConstants);NETCOREAPP2_0_CUSTOM_DEFINE + true @@ -10,12 +11,12 @@ - + - - - - - + + + + + diff --git a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj index cfda2f9c35..17fa586476 100644 --- a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj +++ b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj @@ -2,13 +2,14 @@ $(StandardTestWebsiteTfms) + true - + - - - + + + diff --git a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj index 5486e54caf..4670064597 100644 --- a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj +++ b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj @@ -2,14 +2,15 @@ $(StandardTestWebsiteTfms) + true - + - - - - + + + + diff --git a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj index 9989c770c6..701d552c4a 100644 --- a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj +++ b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj @@ -2,12 +2,13 @@ $(StandardTestWebsiteTfms) + true - + - - + + diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj index 991903c25b..0bb43dbc7c 100644 --- a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj +++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj @@ -3,13 +3,14 @@ $(StandardTestWebsiteTfms) true + true - + - - - + + + diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj index cfda2f9c35..17fa586476 100644 --- a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj +++ b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj @@ -2,13 +2,14 @@ $(StandardTestWebsiteTfms) + true - + - - - + + + diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj index fd4dd53d70..8165cb031c 100644 --- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj +++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj @@ -2,14 +2,15 @@ $(StandardTestWebsiteTfms) + true - - + + - - - + + + diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj index e8cef0d108..eb218807a1 100644 --- a/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj +++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj @@ -1,14 +1,15 @@  $(StandardTestWebsiteTfms) + true - - + + - - - + + + diff --git a/src/Mvc/version.props b/src/Mvc/version.props deleted file mode 100644 index 5f1cf38faa..0000000000 --- a/src/Mvc/version.props +++ /dev/null @@ -1,21 +0,0 @@ - - - 2.1.3 - rtm - t000 - a- - - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - 0.1.3 - rtm - - $(ExperimentalVersionPrefix) - $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final - $(FeatureBranchVersionPrefix)$(ExperimentalVersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(ExperimentalVersionSuffix)-$(BuildNumber) - - From ce481c6c79e1ba9737c555e8d4091e42cc81ca62 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 20 Dec 2018 23:50:53 -0800 Subject: [PATCH 06/80] Make JavaScriptServices use ProjectReference (#5953) --- build/artifacts.props | 1 - build/buildorder.props | 1 - build/repo.props | 1 + build/submodules.props | 1 - eng/Baseline.Designer.props | 28 + eng/Baseline.xml | 3 + eng/ProjectReferences.props | 4 + src/JavaScriptServices/.gitignore | 31 -- src/JavaScriptServices/Directory.Build.props | 16 - .../Directory.Build.targets | 7 - src/JavaScriptServices/JavaScriptServices.sln | 93 ---- .../NuGetPackageVerifier.json | 7 - src/JavaScriptServices/README.md | 96 ---- .../build/dependencies.props | 36 -- src/JavaScriptServices/build/repo.props | 8 - src/JavaScriptServices/build/sources.props | 17 - .../misc/LatencyTest/LatencyTest.csproj | 18 - .../samples/misc/LatencyTest/Program.cs | 52 -- .../samples/misc/LatencyTest/latencyTest.js | 4 - .../NodeServicesExamples.csproj | 27 - .../samples/misc/Webpack/Webpack.csproj | 27 - .../src/Directory.Build.props | 13 - .../.gitignore | 3 - .../Content/Node/entrypoint-socket.js | 524 ------------------ ...oft.AspNetCore.NodeServices.Sockets.csproj | 26 - .../NamedPipeConnection.cs | 40 -- .../PhysicalConnections/StreamConnection.cs | 26 - .../UnixDomainSocketConnection.cs | 40 -- .../UnixDomainSocketEndPoint.cs | 86 --- .../SocketNodeInstance.cs | 240 -------- .../SocketNodeServicesOptionsExtensions.cs | 21 - .../SocketNodeInstanceEntryPoint.ts | 79 --- .../VirtualConnections/VirtualConnection.ts | 43 -- .../VirtualConnectionServer.ts | 199 ------- .../TypeScript/tsconfig.json | 11 - .../VirtualConnections/VirtualConnection.cs | 150 ----- .../VirtualConnectionClient.cs | 238 -------- .../baseline.netcore.json | 109 ---- .../package.json | 18 - .../webpack.config.js | 20 - ...t.AspNetCore.SpaServices.Extensions.csproj | 18 - .../templates/WhereHaveTheTemplatesGone.md | 11 - src/JavaScriptServices/version.props | 12 - .../NodeServices}/README.md | 27 +- .../samples}/NodeServicesExamples/.gitignore | 0 .../Controllers/HomeController.cs | 0 .../Node/prerenderPage.js | 0 .../NodeServicesExamples/Node/renderChart.js | 0 .../Node/transpilation.js | 0 .../NodeServicesExamples.csproj | 24 + .../samples}/NodeServicesExamples/Startup.cs | 0 .../Views/Home/Chart.cshtml | 0 .../Views/Home/ES2015Transpilation.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Home/Prerendering.cshtml | 0 .../Views/Shared/Error.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../NodeServicesExamples/appsettings.json | 0 .../NodeServicesExamples/jsconfig.json | 0 .../NodeServicesExamples/package.json | 0 .../wwwroot/css/chartist.min.css | 0 .../NodeServicesExamples}/wwwroot/favicon.ico | Bin .../NodeServicesExamples/wwwroot/js/main.js | 0 .../NodeServicesExamples/wwwroot/web.config | 0 .../NodeServices/src}/.gitignore | 0 .../src}/Configuration/NodeServicesFactory.cs | 0 .../src}/Configuration/NodeServicesOptions.cs | 0 ...NodeServicesServiceCollectionExtensions.cs | 0 .../src}/Content/Node/entrypoint-http.js | 0 .../src}/HostingModels/HttpNodeInstance.cs | 0 .../src}/HostingModels/INodeInstance.cs | 0 .../HostingModels/NodeInvocationException.cs | 0 .../src}/HostingModels/NodeInvocationInfo.cs | 0 .../NodeServicesOptionsExtensions.cs | 0 .../HostingModels/OutOfProcessNodeInstance.cs | 0 .../NodeServices/src}/INodeServices.cs | 0 .../Microsoft.AspNetCore.NodeServices.csproj | 6 +- .../NodeServices/src}/NodeServicesImpl.cs | 0 .../TypeScript/HttpNodeInstanceEntryPoint.ts | 0 .../src}/TypeScript/Util/ArgsUtil.ts | 0 .../TypeScript/Util/ExitWhenParentExits.ts | 0 .../TypeScript/Util/OverrideStdOutputs.ts | 0 .../Util/PatchModuleResolutionLStat.ts | 0 .../src}/TypeScript/tsconfig.json | 0 .../src}/Util/EmbeddedResourceReader.cs | 0 .../src}/Util/StringAsTempFile.cs | 0 .../NodeServices/src}/Util/TaskExtensions.cs | 0 .../NodeServices/src}/baseline.netcore.json | 0 .../NodeServices/src}/package.json | 0 .../NodeServices/src}/webpack.config.js | 0 .../src}/AngularCli/AngularCliBuilder.cs | 0 .../src}/AngularCli/AngularCliMiddleware.cs | 0 .../AngularCliMiddlewareExtensions.cs | 0 .../src}/DefaultSpaBuilder.cs | 0 .../src}/ISpaBuilder.cs | 0 ...t.AspNetCore.SpaServices.Extensions.csproj | 18 + .../src}/Npm/NpmScriptRunner.cs | 0 .../Prerendering/ISpaPrerendererBuilder.cs | 0 .../Prerendering/SpaPrerenderingExtensions.cs | 0 .../Prerendering/SpaPrerenderingOptions.cs | 0 .../Proxying/ConditionalProxyMiddleware.cs | 0 .../src}/Proxying/SpaProxy.cs | 0 .../src}/Proxying/SpaProxyingExtensions.cs | 0 .../ReactDevelopmentServerMiddleware.cs | 0 ...ctDevelopmentServerMiddlewareExtensions.cs | 0 .../src}/SpaApplicationBuilderExtensions.cs | 0 .../src}/SpaDefaultPageMiddleware.cs | 0 .../SpaServices.Extensions/src}/SpaOptions.cs | 0 .../DefaultSpaStaticFileProvider.cs | 0 .../StaticFiles/ISpaStaticFileProvider.cs | 0 .../StaticFiles/SpaStaticFilesExtensions.cs | 0 .../src}/StaticFiles/SpaStaticFilesOptions.cs | 0 .../src}/Util/EventedStreamReader.cs | 0 .../src}/Util/EventedStreamStringReader.cs | 0 .../src}/Util/LoggerFinder.cs | 0 .../src}/Util/TaskTimeoutExtensions.cs | 0 .../src}/Util/TcpPortFinder.cs | 0 .../src}/baseline.netcore.json | 0 .../SpaServices}/README.md | 12 +- .../SpaServices/samples}/Webpack/.gitignore | 0 .../Webpack/ActionResults/PrerenderResult.cs | 0 .../PrerenderResultExtensions.cs | 0 .../samples}/Webpack/Clientside/App.ts | 0 .../samples}/Webpack/Clientside/HelloWorld.ts | 0 .../Webpack/Clientside/styles/main.less | 0 .../Webpack/Controllers/HomeController.cs | 0 .../SpaServices/samples}/Webpack/Startup.cs | 0 .../samples}/Webpack/Views/Home/Index.cshtml | 0 .../Webpack}/Views/Shared/Error.cshtml | 0 .../Webpack/Views/Shared/_Layout.cshtml | 0 .../Webpack/Views/_ViewImports.cshtml | 0 .../samples/Webpack}/Views/_ViewStart.cshtml | 0 .../samples/Webpack/Webpack.csproj | 24 + .../samples}/Webpack/appsettings.json | 0 .../SpaServices/samples}/Webpack/package.json | 0 .../samples}/Webpack/tsconfig.json | 0 .../samples}/Webpack/webpack.config.dev.js | 0 .../samples}/Webpack/webpack.config.js | 0 .../samples}/Webpack/webpack.config.prod.js | 0 .../samples/Webpack}/wwwroot/favicon.ico | Bin .../samples}/Webpack/wwwroot/web.config | 0 .../SpaServices/src}/.gitignore | 0 .../src}/Content/Node/prerenderer.js | 0 .../Content/Node/webpack-dev-middleware.js | 0 .../Microsoft.AspNetCore.SpaServices.csproj | 6 +- .../Prerendering/DefaultSpaPrerenderer.cs | 0 .../src}/Prerendering/ISpaPrerenderer.cs | 0 .../Prerendering/JavaScriptModuleExport.cs | 0 .../src}/Prerendering/PrerenderTagHelper.cs | 0 .../src}/Prerendering/Prerenderer.cs | 0 ...PrerenderingServiceCollectionExtensions.cs | 0 .../src}/Prerendering/RenderToStringResult.cs | 0 .../src}/Routing/SpaRouteConstraint.cs | 0 .../src}/Routing/SpaRouteExtensions.cs | 0 .../src}/TypeScript/Prerenderer.ts | 0 .../src}/TypeScript/WebpackDevMiddleware.ts | 0 .../SpaServices/src}/TypeScript/tsconfig.json | 0 .../Webpack/ConditionalProxyMiddleware.cs | 0 .../ConditionalProxyMiddlewareOptions.cs | 0 .../src}/Webpack/WebpackDevMiddleware.cs | 0 .../Webpack/WebpackDevMiddlewareOptions.cs | 0 .../SpaServices/src}/baseline.netcore.json | 0 .../src}/npm/aspnet-angular/.gitignore | 0 .../src}/npm/aspnet-angular/.npmignore | 0 .../src/npm/aspnet-angular}/LICENSE.txt | 0 .../src}/npm/aspnet-angular/package.json | 0 .../src/HttpWithStateTransfer.ts | 0 .../src}/npm/aspnet-angular/src/index.ts | 0 .../src}/npm/aspnet-angular/tsconfig.json | 0 .../src}/npm/aspnet-prerendering/.gitignore | 0 .../src}/npm/aspnet-prerendering/.npmignore | 0 .../src/npm/aspnet-prerendering}/LICENSE.txt | 0 .../src/npm/aspnet-prerendering}/README.md | 0 .../src}/npm/aspnet-prerendering/package.json | 0 .../aspnet-prerendering/src/Prerendering.ts | 0 .../src/PrerenderingInterfaces.ts | 0 .../src}/npm/aspnet-prerendering/src/index.ts | 0 .../npm/aspnet-prerendering/tsconfig.json | 0 .../src/npm/aspnet-webpack-react}/.gitignore | 0 .../src/npm/aspnet-webpack-react}/.npmignore | 0 .../src}/npm/aspnet-webpack-react/LICENSE.txt | 0 .../src}/npm/aspnet-webpack-react/README.md | 0 .../npm/aspnet-webpack-react/package.json | 0 .../src/HotModuleReplacement.ts | 0 .../npm/aspnet-webpack-react/src/index.ts | 0 .../npm/aspnet-webpack-react/tsconfig.json | 0 .../src}/npm/aspnet-webpack/.gitignore | 0 .../src}/npm/aspnet-webpack/.npmignore | 0 .../src/npm/aspnet-webpack}/LICENSE.txt | 0 .../src/npm/aspnet-webpack}/README.md | 0 .../src}/npm/aspnet-webpack/package-lock.json | 0 .../src}/npm/aspnet-webpack/package.json | 0 .../npm/aspnet-webpack/src/LoadViaWebpack.ts | 0 .../npm/aspnet-webpack/src/RequireNewCopy.ts | 0 .../src/WebpackDevMiddleware.ts | 0 .../src/WebpackTestPermissions.ts | 0 .../src}/npm/aspnet-webpack/src/index.ts | 0 .../aspnet-webpack/src/typings/memory-fs.d.ts | 0 .../src/typings/require-from-string.d.ts | 0 .../src/typings/webpack-node-externals.d.ts | 0 .../src}/npm/aspnet-webpack/tsconfig.json | 0 .../src/npm/domain-task}/.gitignore | 0 .../src/npm/domain-task}/.npmignore | 0 .../src/npm/domain-task}/LICENSE.txt | 0 .../src}/npm/domain-task/README.md | 0 .../src}/npm/domain-task/package.json | 0 .../npm/domain-task/src/domain-context.d.ts | 0 .../src}/npm/domain-task/src/fetch.ts | 0 .../src}/npm/domain-task/src/index.ts | 0 .../src}/npm/domain-task/src/main.ts | 0 .../src}/npm/domain-task/tsconfig.json | 0 .../SpaServices/src}/package.json | 0 .../SpaServices/src}/webpack.config.js | 0 215 files changed, 114 insertions(+), 2408 deletions(-) delete mode 100644 src/JavaScriptServices/.gitignore delete mode 100644 src/JavaScriptServices/Directory.Build.props delete mode 100644 src/JavaScriptServices/Directory.Build.targets delete mode 100644 src/JavaScriptServices/JavaScriptServices.sln delete mode 100644 src/JavaScriptServices/NuGetPackageVerifier.json delete mode 100644 src/JavaScriptServices/README.md delete mode 100644 src/JavaScriptServices/build/dependencies.props delete mode 100644 src/JavaScriptServices/build/repo.props delete mode 100644 src/JavaScriptServices/build/sources.props delete mode 100644 src/JavaScriptServices/samples/misc/LatencyTest/LatencyTest.csproj delete mode 100644 src/JavaScriptServices/samples/misc/LatencyTest/Program.cs delete mode 100644 src/JavaScriptServices/samples/misc/LatencyTest/latencyTest.js delete mode 100644 src/JavaScriptServices/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj delete mode 100644 src/JavaScriptServices/samples/misc/Webpack/Webpack.csproj delete mode 100644 src/JavaScriptServices/src/Directory.Build.props delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/.gitignore delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/Content/Node/entrypoint-socket.js delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/NamedPipeConnection.cs delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/StreamConnection.cs delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketConnection.cs delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketEndPoint.cs delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeServicesOptionsExtensions.cs delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnection.ts delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnectionServer.ts delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/tsconfig.json delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnectionClient.cs delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/baseline.netcore.json delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/package.json delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/webpack.config.js delete mode 100644 src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj delete mode 100644 src/JavaScriptServices/templates/WhereHaveTheTemplatesGone.md delete mode 100644 src/JavaScriptServices/version.props rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices}/README.md (85%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/.gitignore (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Controllers/HomeController.cs (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Node/prerenderPage.js (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Node/renderChart.js (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Node/transpilation.js (100%) create mode 100644 src/Middleware/NodeServices/samples/NodeServicesExamples/NodeServicesExamples.csproj rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Startup.cs (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Views/Home/Chart.cshtml (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Views/Home/ES2015Transpilation.cshtml (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Views/Home/Index.cshtml (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Views/Home/Prerendering.cshtml (100%) rename src/{JavaScriptServices/samples/misc/Webpack => Middleware/NodeServices/samples/NodeServicesExamples}/Views/Shared/Error.cshtml (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Views/Shared/_Layout.cshtml (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/Views/_ViewImports.cshtml (100%) rename src/{JavaScriptServices/samples/misc/Webpack => Middleware/NodeServices/samples/NodeServicesExamples}/Views/_ViewStart.cshtml (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/appsettings.json (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/jsconfig.json (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/package.json (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/wwwroot/css/chartist.min.css (100%) rename src/{JavaScriptServices/samples/misc/Webpack => Middleware/NodeServices/samples/NodeServicesExamples}/wwwroot/favicon.ico (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/wwwroot/js/main.js (100%) rename src/{JavaScriptServices/samples/misc => Middleware/NodeServices/samples}/NodeServicesExamples/wwwroot/web.config (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/.gitignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/Configuration/NodeServicesFactory.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/Configuration/NodeServicesOptions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/Configuration/NodeServicesServiceCollectionExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/Content/Node/entrypoint-http.js (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/HostingModels/HttpNodeInstance.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/HostingModels/INodeInstance.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/HostingModels/NodeInvocationException.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/HostingModels/NodeInvocationInfo.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/HostingModels/NodeServicesOptionsExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/HostingModels/OutOfProcessNodeInstance.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/INodeServices.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/Microsoft.AspNetCore.NodeServices.csproj (62%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/NodeServicesImpl.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/TypeScript/HttpNodeInstanceEntryPoint.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/TypeScript/Util/ArgsUtil.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/TypeScript/Util/ExitWhenParentExits.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/TypeScript/Util/OverrideStdOutputs.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/TypeScript/Util/PatchModuleResolutionLStat.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/TypeScript/tsconfig.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/Util/EmbeddedResourceReader.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/Util/StringAsTempFile.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/Util/TaskExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/baseline.netcore.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/package.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.NodeServices => Middleware/NodeServices/src}/webpack.config.js (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/AngularCli/AngularCliBuilder.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/AngularCli/AngularCliMiddleware.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/AngularCli/AngularCliMiddlewareExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/DefaultSpaBuilder.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/ISpaBuilder.cs (100%) create mode 100644 src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Npm/NpmScriptRunner.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Prerendering/ISpaPrerendererBuilder.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Prerendering/SpaPrerenderingExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Prerendering/SpaPrerenderingOptions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Proxying/ConditionalProxyMiddleware.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Proxying/SpaProxy.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Proxying/SpaProxyingExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/ReactDevelopmentServer/ReactDevelopmentServerMiddlewareExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/SpaApplicationBuilderExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/SpaDefaultPageMiddleware.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/SpaOptions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/StaticFiles/DefaultSpaStaticFileProvider.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/StaticFiles/ISpaStaticFileProvider.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/StaticFiles/SpaStaticFilesExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/StaticFiles/SpaStaticFilesOptions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Util/EventedStreamReader.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Util/EventedStreamStringReader.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Util/LoggerFinder.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Util/TaskTimeoutExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/Util/TcpPortFinder.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions => Middleware/SpaServices.Extensions/src}/baseline.netcore.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices}/README.md (98%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/.gitignore (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/ActionResults/PrerenderResult.cs (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/ActionResults/PrerenderResultExtensions.cs (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/Clientside/App.ts (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/Clientside/HelloWorld.ts (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/Clientside/styles/main.less (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/Controllers/HomeController.cs (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/Startup.cs (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/Views/Home/Index.cshtml (100%) rename src/{JavaScriptServices/samples/misc/NodeServicesExamples => Middleware/SpaServices/samples/Webpack}/Views/Shared/Error.cshtml (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/Views/Shared/_Layout.cshtml (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/Views/_ViewImports.cshtml (100%) rename src/{JavaScriptServices/samples/misc/NodeServicesExamples => Middleware/SpaServices/samples/Webpack}/Views/_ViewStart.cshtml (100%) create mode 100644 src/Middleware/SpaServices/samples/Webpack/Webpack.csproj rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/appsettings.json (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/package.json (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/tsconfig.json (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/webpack.config.dev.js (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/webpack.config.js (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/webpack.config.prod.js (100%) rename src/{JavaScriptServices/samples/misc/NodeServicesExamples => Middleware/SpaServices/samples/Webpack}/wwwroot/favicon.ico (100%) rename src/{JavaScriptServices/samples/misc => Middleware/SpaServices/samples}/Webpack/wwwroot/web.config (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/.gitignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Content/Node/prerenderer.js (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Content/Node/webpack-dev-middleware.js (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Microsoft.AspNetCore.SpaServices.csproj (63%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Prerendering/DefaultSpaPrerenderer.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Prerendering/ISpaPrerenderer.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Prerendering/JavaScriptModuleExport.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Prerendering/PrerenderTagHelper.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Prerendering/Prerenderer.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Prerendering/PrerenderingServiceCollectionExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Prerendering/RenderToStringResult.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Routing/SpaRouteConstraint.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Routing/SpaRouteExtensions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/TypeScript/Prerenderer.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/TypeScript/WebpackDevMiddleware.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/TypeScript/tsconfig.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Webpack/ConditionalProxyMiddleware.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Webpack/ConditionalProxyMiddlewareOptions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Webpack/WebpackDevMiddleware.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/Webpack/WebpackDevMiddlewareOptions.cs (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/baseline.netcore.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-angular/.gitignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-angular/.npmignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task => Middleware/SpaServices/src/npm/aspnet-angular}/LICENSE.txt (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-angular/package.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-angular/src/HttpWithStateTransfer.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-angular/src/index.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-angular/tsconfig.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-prerendering/.gitignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-prerendering/.npmignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack => Middleware/SpaServices/src/npm/aspnet-prerendering}/LICENSE.txt (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack => Middleware/SpaServices/src/npm/aspnet-prerendering}/README.md (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-prerendering/package.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-prerendering/src/Prerendering.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-prerendering/src/index.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-prerendering/tsconfig.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task => Middleware/SpaServices/src/npm/aspnet-webpack-react}/.gitignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task => Middleware/SpaServices/src/npm/aspnet-webpack-react}/.npmignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack-react/LICENSE.txt (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack-react/README.md (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack-react/package.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack-react/src/HotModuleReplacement.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack-react/src/index.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack-react/tsconfig.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/.gitignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/.npmignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering => Middleware/SpaServices/src/npm/aspnet-webpack}/LICENSE.txt (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering => Middleware/SpaServices/src/npm/aspnet-webpack}/README.md (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/package-lock.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/package.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/src/LoadViaWebpack.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/src/RequireNewCopy.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/src/WebpackDevMiddleware.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/src/WebpackTestPermissions.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/src/index.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/src/typings/memory-fs.d.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/src/typings/require-from-string.d.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/src/typings/webpack-node-externals.d.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/aspnet-webpack/tsconfig.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react => Middleware/SpaServices/src/npm/domain-task}/.gitignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react => Middleware/SpaServices/src/npm/domain-task}/.npmignore (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular => Middleware/SpaServices/src/npm/domain-task}/LICENSE.txt (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/domain-task/README.md (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/domain-task/package.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/domain-task/src/domain-context.d.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/domain-task/src/fetch.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/domain-task/src/index.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/domain-task/src/main.ts (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/npm/domain-task/tsconfig.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/package.json (100%) rename src/{JavaScriptServices/src/Microsoft.AspNetCore.SpaServices => Middleware/SpaServices/src}/webpack.config.js (100%) diff --git a/build/artifacts.props b/build/artifacts.props index 31d51ead28..310c2f5d0f 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -104,7 +104,6 @@ - diff --git a/build/buildorder.props b/build/buildorder.props index 74e3caa853..b51d1cfa39 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -10,7 +10,6 @@ - diff --git a/build/repo.props b/build/repo.props index d7f3bc5693..042d08c18b 100644 --- a/build/repo.props +++ b/build/repo.props @@ -61,6 +61,7 @@ diff --git a/build/submodules.props b/build/submodules.props index 45210f9217..a7e78f1a4d 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -49,7 +49,6 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index c418f92be1..9645bd8e84 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -645,6 +645,15 @@ + + + 2.1.1 + + + + + + 2.1.1 @@ -865,6 +874,25 @@ + + + 2.1.1 + + + + + + + + + + 2.1.1 + + + + + + 2.1.1 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index ae2c6a254c..3a740e316d 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -73,6 +73,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + @@ -93,6 +94,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index e50fe72bcb..448b48db82 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -114,5 +114,9 @@ + + + + diff --git a/src/JavaScriptServices/.gitignore b/src/JavaScriptServices/.gitignore deleted file mode 100644 index 79812ddba3..0000000000 --- a/src/JavaScriptServices/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.vs/ -npm-debug.log -/.build/ -.vscode/ -global.json diff --git a/src/JavaScriptServices/Directory.Build.props b/src/JavaScriptServices/Directory.Build.props deleted file mode 100644 index a00dce6550..0000000000 --- a/src/JavaScriptServices/Directory.Build.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)..\..\eng\AspNetCore.snk - true - true - true - - diff --git a/src/JavaScriptServices/Directory.Build.targets b/src/JavaScriptServices/Directory.Build.targets deleted file mode 100644 index 53b3f6e1da..0000000000 --- a/src/JavaScriptServices/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/JavaScriptServices/JavaScriptServices.sln b/src/JavaScriptServices/JavaScriptServices.sln deleted file mode 100644 index f01aa1a956..0000000000 --- a/src/JavaScriptServices/JavaScriptServices.sln +++ /dev/null @@ -1,93 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.16 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27304DDE-AFB2-4F8B-B765-E3E2F11E886C}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices", "src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj", "{66B77203-1469-41DF-92F2-2BE6900BD36F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices.Sockets", "src\Microsoft.AspNetCore.NodeServices.Sockets\Microsoft.AspNetCore.NodeServices.Sockets.csproj", "{F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices", "src\Microsoft.AspNetCore.SpaServices\Microsoft.AspNetCore.SpaServices.csproj", "{66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{99EAF1FE-22C8-4526-BE78-74B24125D37F}" - ProjectSection(SolutionItems) = preProject - .gitignore = .gitignore - global.json = global.json - README.md = README.md - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{23836492-E7F4-4376-85BF-A635C304AC46}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{E6A161EA-646C-4033-9090-95BE809AB8D9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LatencyTest", "samples\misc\LatencyTest\LatencyTest.csproj", "{1931B19A-EC42-4D56-B2D0-FB06D17244DA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webpack", "samples\misc\Webpack\Webpack.csproj", "{DE479DC3-1461-4EAD-A188-4AF7AA4AE344}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "samples\misc\NodeServicesExamples\NodeServicesExamples.csproj", "{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{645F7363-1240-4FB6-9422-B32A327C979F}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices.Extensions", "src\Microsoft.AspNetCore.SpaServices.Extensions\Microsoft.AspNetCore.SpaServices.Extensions.csproj", "{D40BD1C4-6A6F-4213-8535-1057F3EB3400}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66B77203-1469-41DF-92F2-2BE6900BD36F}.Release|Any CPU.Build.0 = Release|Any CPU - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3}.Release|Any CPU.Build.0 = Release|Any CPU - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC}.Release|Any CPU.Build.0 = Release|Any CPU - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1931B19A-EC42-4D56-B2D0-FB06D17244DA}.Release|Any CPU.Build.0 = Release|Any CPU - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344}.Release|Any CPU.Build.0 = Release|Any CPU - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.Build.0 = Release|Any CPU - {D40BD1C4-6A6F-4213-8535-1057F3EB3400}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D40BD1C4-6A6F-4213-8535-1057F3EB3400}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D40BD1C4-6A6F-4213-8535-1057F3EB3400}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D40BD1C4-6A6F-4213-8535-1057F3EB3400}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {66B77203-1469-41DF-92F2-2BE6900BD36F} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} - {F46DEF99-6FAA-4406-B5D8-6FF34EF669E3} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} - {66B071A8-EFC8-4A06-BEF6-06B99AE27EEC} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} - {E6A161EA-646C-4033-9090-95BE809AB8D9} = {23836492-E7F4-4376-85BF-A635C304AC46} - {1931B19A-EC42-4D56-B2D0-FB06D17244DA} = {E6A161EA-646C-4033-9090-95BE809AB8D9} - {DE479DC3-1461-4EAD-A188-4AF7AA4AE344} = {E6A161EA-646C-4033-9090-95BE809AB8D9} - {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE} = {E6A161EA-646C-4033-9090-95BE809AB8D9} - {D40BD1C4-6A6F-4213-8535-1057F3EB3400} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DDF59B0D-2DEC-45D6-8667-DCB767487101} - EndGlobalSection -EndGlobal diff --git a/src/JavaScriptServices/NuGetPackageVerifier.json b/src/JavaScriptServices/NuGetPackageVerifier.json deleted file mode 100644 index 22ef3c09c0..0000000000 --- a/src/JavaScriptServices/NuGetPackageVerifier.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} diff --git a/src/JavaScriptServices/README.md b/src/JavaScriptServices/README.md deleted file mode 100644 index 5ba59473c2..0000000000 --- a/src/JavaScriptServices/README.md +++ /dev/null @@ -1,96 +0,0 @@ -# JavaScriptServices - -AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/gprilrckx116vc9m/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/javascriptservices/branch/dev) - -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. - -## What is this? - -`JavaScriptServices` is a set of client-side technologies for ASP.NET Core. It provides infrastructure that you'll find useful if you: - -- Use Angular / React / Vue / Aurelia / Knockout / etc. -- Build your client-side resources using Webpack. -- Execute JavaScript on the server at runtime. - -Read [Building Single Page Applications on ASP.NET Core with JavaScriptServices](https://blogs.msdn.microsoft.com/webdev/2017/02/14/building-single-page-applications-on-asp-net-core-with-javascriptservices/) for more details. - -This repo contains: - - * A set of NuGet/NPM packages that implement functionality for: - * Invoking arbitrary NPM packages at runtime from .NET code ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.NodeServices#simple-usage-example)) - * Server-side prerendering of SPA components ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#server-side-prerendering)) - * Webpack dev middleware ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#webpack-dev-middleware)) - * Hot module replacement (HMR) ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#webpack-hot-module-replacement)) - * Server-side and client-side routing integration ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#routing-helper-mapspafallbackroute)) - * Server-side and client-side validation integration - * "Lazy loading" for Knockout apps - * Samples and docs - -It's cross-platform (Windows, Linux, or macOS) and works with .NET Core 2.0 or later. - -## Creating new applications - -Prerequisites: - -* [.NET Core 2.0](https://www.microsoft.com/net/core) (or later) SDK -* [Node.js](https://nodejs.org/) version 6 (or later) - -With these prerequisites, you can immediately create new ASP.NET Core applications that use Angular, React, or React+Redux without having to install anything extra. - -### Option 1: Creating Angular/React/Redux applications from the command line (cross-platform) - -In an empty directory, run (for example) `dotnet new angular`. Other supported SPA frameworks include React and React+Redux. You can see the list of available SPA templates by running `dotnet new spa`. - -Once the generator has run and restored all the dependencies, you can start up your new ASP.NET Core SPA: - - npm install - dotnet run - -### Option 2: Creating Angular/React/Redux applications using Visual Studio 2017 Update 3 or later (Windows only) - -Using the `File`->`New Project` dialog, select *ASP.NET Core Web Application*. You will then be offered the option to create an application with Angular, React, or React+Redux. When the application is created, you can build and run it in the normal way. - -### More info and other SPA frameworks - -For a more detailed (albeit somewhat outdated) walkthrough, see [getting started with the `aspnetcore-spa` generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/). - -If you want to build an ASP.NET Core application with Aurelia, Knockout, or Vue, you can use the `Microsoft.AspNetCore.SpaTemplates` package. On the command line, run `dotnet new --install Microsoft.AspNetCore.SpaTemplates`. Then you will be able to run `dotnet new aurelia` (or `dotnet new vue`, etc.) to create your new application. - -## Adding to existing applications - -If you have an existing ASP.NET Core application, or if you just want to use the underlying JavaScriptServices packages directly, you can install these packages using NuGet and NPM: - - * `Microsoft.AspNetCore.NodeServices` - * This provides a fast and robust way for .NET code to run JavaScript on the server inside a Node.js environment. You can use this to consume arbitrary functionality from NPM packages at runtime in your ASP.NET Core app. - * Most applications developers don't need to use this directly, but you can do so if you want to implement your own functionality that involves calling Node.js code from .NET at runtime. - * Find [documentation and usage examples here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.NodeServices#microsoftaspnetcorenodeservices). - * `Microsoft.AspNetCore.SpaServices` - * This provides infrastructure that's generally useful when building Single Page Applications (SPAs) with technologies such as Angular or React (for example, server-side prerendering and webpack middleware). Internally, it uses the `NodeServices` package to implement its features. - * Find [documentation and usage examples here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#microsoftaspnetcorespaservices) - -There were previously other packages called `Microsoft.AspNetCore.AngularServices` and `Microsoft.AspNetCore.ReactServices` but these are not currently needed - all applicable functionality is in `Microsoft.AspNetCore.SpaServices`, because it's sufficiently general. - -If you want to build a helper library for some other SPA framework, you can do so by taking a dependency on `Microsoft.AspNetCore.SpaServices` and wrapping its functionality in whatever way is most useful for your SPA framework. - -## Samples - -The [`samples` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/samples) contains examples of: - -- Using the JavaScript services family of packages with Angular and React. -- A standalone `NodeServices` usage for runtime code transpilation and image processing. - -**To run the samples:** - - * Clone this repo - * At the repo's root directory (the one containing `src`, `samples`, etc.), run `dotnet restore` - * Change directory to the sample you want to run (for example, `cd samples/angular/MusicStore`) - * Restore Node dependencies by running `npm install` - * If you're trying to run the Angular "Music Store" sample, then also run `gulp` (which you need to have installed globally). None of the other samples require this. - * Run the application (`dotnet run`) - * Browse to [http://localhost:5000](http://localhost:5000) - -## Contributing - -If you're interested in contributing to the various packages, samples, and project templates in this repo, that's great! - -Before working on a pull request, especially if it's more than a trivial fix (for example, for a typo), it's usually a good idea first to file an issue describing what you're proposing to do and how it will work. Then you can find out if it's likely that such a pull request will be accepted, and how it fits into wider ongoing plans. diff --git a/src/JavaScriptServices/build/dependencies.props b/src/JavaScriptServices/build/dependencies.props deleted file mode 100644 index 1f28e36f46..0000000000 --- a/src/JavaScriptServices/build/dependencies.props +++ /dev/null @@ -1,36 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.1.3-rtm-15802 - 2.0.0 - 2.1.2 - 2.0.3 - 11.0.2 - 4.9.0 - - - - - - - - 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.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - - \ No newline at end of file diff --git a/src/JavaScriptServices/build/repo.props b/src/JavaScriptServices/build/repo.props deleted file mode 100644 index 1dc8b8100d..0000000000 --- a/src/JavaScriptServices/build/repo.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/JavaScriptServices/build/sources.props b/src/JavaScriptServices/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/JavaScriptServices/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/JavaScriptServices/samples/misc/LatencyTest/LatencyTest.csproj b/src/JavaScriptServices/samples/misc/LatencyTest/LatencyTest.csproj deleted file mode 100644 index 4e37b7bcb3..0000000000 --- a/src/JavaScriptServices/samples/misc/LatencyTest/LatencyTest.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp2.1;net461 - false - exe - - - - - - - - - - - - diff --git a/src/JavaScriptServices/samples/misc/LatencyTest/Program.cs b/src/JavaScriptServices/samples/misc/LatencyTest/Program.cs deleted file mode 100644 index bafe4b9fbc..0000000000 --- a/src/JavaScriptServices/samples/misc/LatencyTest/Program.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.NodeServices; -using Microsoft.AspNetCore.NodeServices.Sockets; -using Microsoft.Extensions.DependencyInjection; - -namespace ConsoleApplication -{ - // This project is a micro-benchmark for .NET->Node RPC via NodeServices. It doesn't reflect - // real-world usage patterns (you're not likely to make hundreds of sequential calls like this), - // but is a starting point for comparing the overhead of different hosting models and transports. - public class Program - { - public static void Main(string[] args) { - // Set up the DI system - var services = new ServiceCollection(); - services.AddNodeServices(options => { - // To compare with Socket hosting, uncomment the following line - // Since .NET Core 1.1, the HTTP hosting model has become basically as fast as the Socket hosting model - //options.UseSocketHosting(); - - options.WatchFileExtensions = new string[] {}; // Don't watch anything - }); - var serviceProvider = services.BuildServiceProvider(); - - // Now instantiate an INodeServices and use it - using (var nodeServices = serviceProvider.GetRequiredService()) { - MeasureLatency(nodeServices).Wait(); - } - } - - private static async Task MeasureLatency(INodeServices nodeServices) { - // Ensure the connection is open, so we can measure per-request timings below - var response = await nodeServices.InvokeAsync("latencyTest", "C#"); - Console.WriteLine(response); - - // Now perform a series of requests, capturing the time taken - const int requestCount = 100; - var watch = Stopwatch.StartNew(); - for (var i = 0; i < requestCount; i++) { - await nodeServices.InvokeAsync("latencyTest", "C#"); - } - - // Display results - var elapsedSeconds = (float)watch.ElapsedTicks / Stopwatch.Frequency; - Console.WriteLine("\nTotal time: {0:F2} milliseconds", 1000 * elapsedSeconds); - Console.WriteLine("\nTime per invocation: {0:F2} milliseconds", 1000 * elapsedSeconds / requestCount); - } - } -} diff --git a/src/JavaScriptServices/samples/misc/LatencyTest/latencyTest.js b/src/JavaScriptServices/samples/misc/LatencyTest/latencyTest.js deleted file mode 100644 index 9feb344a32..0000000000 --- a/src/JavaScriptServices/samples/misc/LatencyTest/latencyTest.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = function(callback, incomingParam1) { - var result = 'Hello, ' + incomingParam1 + '!'; - callback(/* error */ null, result); -} diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/src/JavaScriptServices/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj deleted file mode 100644 index e42d25247a..0000000000 --- a/src/JavaScriptServices/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - netcoreapp2.1;net461 - true - false - - - - - - - - - - - - - - - - - - - - - diff --git a/src/JavaScriptServices/samples/misc/Webpack/Webpack.csproj b/src/JavaScriptServices/samples/misc/Webpack/Webpack.csproj deleted file mode 100644 index e42d25247a..0000000000 --- a/src/JavaScriptServices/samples/misc/Webpack/Webpack.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - netcoreapp2.1;net461 - true - false - - - - - - - - - - - - - - - - - - - - - diff --git a/src/JavaScriptServices/src/Directory.Build.props b/src/JavaScriptServices/src/Directory.Build.props deleted file mode 100644 index 272b8171cc..0000000000 --- a/src/JavaScriptServices/src/Directory.Build.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - aspnetcore;aspnetcoremvc;nodeservices - - - - - - diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/.gitignore b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/.gitignore deleted file mode 100644 index 98edee716e..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/node_modules/ -yarn.lock diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/Content/Node/entrypoint-socket.js b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/Content/Node/entrypoint-socket.js deleted file mode 100644 index 89b72f4a79..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/Content/Node/entrypoint-socket.js +++ /dev/null @@ -1,524 +0,0 @@ -(function(e, a) { for(var i in a) e[i] = a[i]; }(exports, /******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; - -/******/ // The require function -/******/ function __webpack_require__(moduleId) { - -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; - -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ exports: {}, -/******/ id: moduleId, -/******/ loaded: false -/******/ }; - -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); - -/******/ // Flag the module as loaded -/******/ module.loaded = true; - -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } - - -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; - -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; - -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; - -/******/ // Load entry module and return exports -/******/ return __webpack_require__(0); -/******/ }) -/************************************************************************/ -/******/ ([ -/* 0 */ -/***/ function(module, exports, __webpack_require__) { - - module.exports = __webpack_require__(1); - - -/***/ }, -/* 1 */ -/***/ function(module, exports, __webpack_require__) { - - "use strict"; - // Limit dependencies to core Node modules. This means the code in this file has to be very low-level and unattractive, - // but simplifies things for the consumer of this module. - __webpack_require__(2); - var net = __webpack_require__(3); - var path = __webpack_require__(4); - var readline = __webpack_require__(5); - var ArgsUtil_1 = __webpack_require__(6); - var ExitWhenParentExits_1 = __webpack_require__(7); - var virtualConnectionServer = __webpack_require__(8); - // Webpack doesn't support dynamic requires for files not present at compile time, so grab a direct - // reference to Node's runtime 'require' function. - var dynamicRequire = eval('require'); - // Signal to the .NET side when we're ready to accept invocations - var server = net.createServer().on('listening', function () { - console.log('[Microsoft.AspNetCore.NodeServices:Listening]'); - }); - // Each virtual connection represents a separate invocation - virtualConnectionServer.createInterface(server).on('connection', function (connection) { - readline.createInterface(connection, null).on('line', function (line) { - try { - // Get a reference to the function to invoke - var invocation = JSON.parse(line); - var invokedModule = dynamicRequire(path.resolve(process.cwd(), invocation.moduleName)); - var invokedFunction = invocation.exportedFunctionName ? invokedModule[invocation.exportedFunctionName] : invokedModule; - // Prepare a callback for accepting non-streamed JSON responses - var hasInvokedCallback_1 = false; - var invocationCallback = function (errorValue, successValue) { - if (hasInvokedCallback_1) { - throw new Error('Cannot supply more than one result. The callback has already been invoked,' - + ' or the result stream has already been accessed'); - } - hasInvokedCallback_1 = true; - connection.end(JSON.stringify({ - result: successValue, - errorMessage: errorValue && (errorValue.message || errorValue), - errorDetails: errorValue && (errorValue.stack || null) - })); - }; - // Also support streamed binary responses - Object.defineProperty(invocationCallback, 'stream', { - enumerable: true, - get: function () { - hasInvokedCallback_1 = true; - return connection; - } - }); - // Actually invoke it, passing through any supplied args - invokedFunction.apply(null, [invocationCallback].concat(invocation.args)); - } - catch (ex) { - connection.end(JSON.stringify({ - errorMessage: ex.message, - errorDetails: ex.stack - })); - } - }); - }); - // Begin listening now. The underlying transport varies according to the runtime platform. - // On Windows it's Named Pipes; on Linux/OSX it's Domain Sockets. - var useWindowsNamedPipes = /^win/.test(process.platform); - var parsedArgs = ArgsUtil_1.parseArgs(process.argv); - var listenAddress = (useWindowsNamedPipes ? '\\\\.\\pipe\\' : '/tmp/') + parsedArgs.listenAddress; - server.listen(listenAddress); - ExitWhenParentExits_1.exitWhenParentExits(parseInt(parsedArgs.parentPid)); - - -/***/ }, -/* 2 */ -/***/ function(module, exports) { - - // When Node writes to stdout/strerr, we capture that and convert the lines into calls on the - // active .NET ILogger. But by default, stdout/stderr don't have any way of distinguishing - // linebreaks inside log messages from the linebreaks that delimit separate log messages, - // so multiline strings will end up being written to the ILogger as multiple independent - // log messages. This makes them very hard to make sense of, especially when they represent - // something like stack traces. - // - // To fix this, we intercept stdout/stderr writes, and replace internal linebreaks with a - // marker token. When .NET receives the lines, it converts the marker tokens back to regular - // linebreaks within the logged messages. - // - // Note that it's better to do the interception at the stdout/stderr level, rather than at - // the console.log/console.error (etc.) level, because this takes place after any native - // message formatting has taken place (e.g., inserting values for % placeholders). - var findInternalNewlinesRegex = /\n(?!$)/g; - var encodedNewline = '__ns_newline__'; - encodeNewlinesWrittenToStream(process.stdout); - encodeNewlinesWrittenToStream(process.stderr); - function encodeNewlinesWrittenToStream(outputStream) { - var origWriteFunction = outputStream.write; - outputStream.write = function (value) { - // Only interfere with the write if it's definitely a string - if (typeof value === 'string') { - var argsClone = Array.prototype.slice.call(arguments, 0); - argsClone[0] = encodeNewlinesInString(value); - origWriteFunction.apply(this, argsClone); - } - else { - origWriteFunction.apply(this, arguments); - } - }; - } - function encodeNewlinesInString(str) { - return str.replace(findInternalNewlinesRegex, encodedNewline); - } - - -/***/ }, -/* 3 */ -/***/ function(module, exports) { - - module.exports = require("net"); - -/***/ }, -/* 4 */ -/***/ function(module, exports) { - - module.exports = require("path"); - -/***/ }, -/* 5 */ -/***/ function(module, exports) { - - module.exports = require("readline"); - -/***/ }, -/* 6 */ -/***/ function(module, exports) { - - "use strict"; - function parseArgs(args) { - // Very simplistic parsing which is sufficient for the cases needed. We don't want to bring in any external - // dependencies (such as an args-parsing library) to this file. - var result = {}; - var currentKey = null; - args.forEach(function (arg) { - if (arg.indexOf('--') === 0) { - var argName = arg.substring(2); - result[argName] = undefined; - currentKey = argName; - } - else if (currentKey) { - result[currentKey] = arg; - currentKey = null; - } - }); - return result; - } - exports.parseArgs = parseArgs; - - -/***/ }, -/* 7 */ -/***/ function(module, exports) { - - /* - In general, we want the Node child processes to be terminated as soon as the parent .NET processes exit, - because we have no further use for them. If the .NET process shuts down gracefully, it will run its - finalizers, one of which (in OutOfProcessNodeInstance.cs) will kill its associated Node process immediately. - - But if the .NET process is terminated forcefully (e.g., on Linux/OSX with 'kill -9'), then it won't have - any opportunity to shut down its child processes, and by default they will keep running. In this case, it's - up to the child process to detect this has happened and terminate itself. - - There are many possible approaches to detecting when a parent process has exited, most of which behave - differently between Windows and Linux/OS X: - - - On Windows, the parent process can mark its child as being a 'job' that should auto-terminate when - the parent does (http://stackoverflow.com/a/4657392). Not cross-platform. - - The child Node process can get a callback when the parent disconnects (process.on('disconnect', ...)). - But despite http://stackoverflow.com/a/16487966, no callback fires in any case I've tested (Windows / OS X). - - The child Node process can get a callback when its stdin/stdout are disconnected, as described at - http://stackoverflow.com/a/15693934. This works well on OS X, but calling stdout.resume() on Windows - causes the process to terminate prematurely. - - I don't know why, but on Windows, it's enough to invoke process.stdin.resume(). For some reason this causes - the child Node process to exit as soon as the parent one does, but I don't see this documented anywhere. - - You can poll to see if the parent process, or your stdin/stdout connection to it, is gone - - You can directly pass a parent process PID to the child, and then have the child poll to see if it's - still running (e.g., using process.kill(pid, 0), which doesn't kill it but just tests whether it exists, - as per https://nodejs.org/api/process.html#process_process_kill_pid_signal) - - Or, on each poll, you can try writing to process.stdout. If the parent has died, then this will throw. - However I don't see this documented anywhere. It would be nice if you could just poll for whether or not - process.stdout is still connected (without actually writing to it) but I haven't found any property whose - value changes until you actually try to write to it. - - Of these, the only cross-platform approach that is actually documented as a valid strategy is simply polling - to check whether the parent PID is still running. So that's what we do here. - */ - "use strict"; - var pollIntervalMs = 1000; - function exitWhenParentExits(parentPid) { - setInterval(function () { - if (!processExists(parentPid)) { - // Can't log anything at this point, because out stdout was connected to the parent, - // but the parent is gone. - process.exit(); - } - }, pollIntervalMs); - } - exports.exitWhenParentExits = exitWhenParentExits; - function processExists(pid) { - try { - // Sending signal 0 - on all platforms - tests whether the process exists. As long as it doesn't - // throw, that means it does exist. - process.kill(pid, 0); - return true; - } - catch (ex) { - // If the reason for the error is that we don't have permission to ask about this process, - // report that as a separate problem. - if (ex.code === 'EPERM') { - throw new Error("Attempted to check whether process " + pid + " was running, but got a permissions error."); - } - return false; - } - } - - -/***/ }, -/* 8 */ -/***/ function(module, exports, __webpack_require__) { - - "use strict"; - var events_1 = __webpack_require__(9); - var VirtualConnection_1 = __webpack_require__(10); - // Keep this in sync with the equivalent constant in the .NET code. Both sides split up their transmissions into frames with this max length, - // and both will reject longer frames. - var MaxFrameBodyLength = 16 * 1024; - /** - * Accepts connections to a net.Server and adapts them to behave as multiplexed connections. That is, for each physical socket connection, - * we track a list of 'virtual connections' whose API is a Duplex stream. The remote clients may open and close as many virtual connections - * as they wish, reading and writing to them independently, without the overhead of establishing new physical connections each time. - */ - function createInterface(server) { - var emitter = new events_1.EventEmitter(); - server.on('connection', function (socket) { - // For each physical socket connection, maintain a set of virtual connections. Issue a notification whenever - // a new virtual connections is opened. - var childSockets = new VirtualConnectionsCollection(socket, function (virtualConnection) { - emitter.emit('connection', virtualConnection); - }); - }); - return emitter; - } - exports.createInterface = createInterface; - /** - * Tracks the 'virtual connections' associated with a single physical socket connection. - */ - var VirtualConnectionsCollection = (function () { - function VirtualConnectionsCollection(_socket, _onVirtualConnectionCallback) { - var _this = this; - this._socket = _socket; - this._onVirtualConnectionCallback = _onVirtualConnectionCallback; - this._currentFrameHeader = null; - this._virtualConnections = {}; - // If the remote end closes the physical socket, treat all the virtual connections as being closed remotely too - this._socket.on('close', function () { - Object.getOwnPropertyNames(_this._virtualConnections).forEach(function (id) { - // A 'null' frame signals that the connection was closed remotely - _this._virtualConnections[id].onReceivedData(null); - }); - }); - this._socket.on('readable', this._onIncomingDataAvailable.bind(this)); - } - /** - * This is called whenever the underlying socket signals that it may have some data available to read. It will synchronously read as many - * message frames as it can from the underlying socket, opens virtual connections as needed, and dispatches data to them. - */ - VirtualConnectionsCollection.prototype._onIncomingDataAvailable = function () { - var exhaustedAllData = false; - while (!exhaustedAllData) { - // We might already have a pending frame header from the previous time this method ran, but if not, that's the next thing we need to read - if (this._currentFrameHeader === null) { - this._currentFrameHeader = this._readNextFrameHeader(); - } - if (this._currentFrameHeader === null) { - // There's not enough data to fill a frameheader, so wait until more arrives later - // The next attempt to read from the socket will start from the same place this one did (incomplete reads don't consume any data) - exhaustedAllData = true; - } - else { - var frameBodyLength = this._currentFrameHeader.bodyLength; - var frameBodyOrNull = frameBodyLength > 0 ? this._socket.read(this._currentFrameHeader.bodyLength) : null; - if (frameBodyOrNull !== null || frameBodyLength === 0) { - // We have a complete frame header+body pair, so we can now dispatch this to a virtual connection. We set _currentFrameHeader back to null - // so that the next thing we try to read is the next frame header. - var headerCopy = this._currentFrameHeader; - this._currentFrameHeader = null; - this._onReceivedCompleteFrame(headerCopy, frameBodyOrNull); - } - else { - // There's not enough data to fill the pending frame body, so wait until more arrives later - // The next attempt to read from the socket will start from the same place this one did (incomplete reads don't consume any data) - exhaustedAllData = true; - } - } - } - }; - VirtualConnectionsCollection.prototype._onReceivedCompleteFrame = function (header, bodyIfNotEmpty) { - // An incoming zero-length frame signals that there's no more data to read. - // Signal this to the Node stream APIs by pushing a 'null' chunk to it. - var virtualConnection = this._getOrOpenVirtualConnection(header); - virtualConnection.onReceivedData(header.bodyLength > 0 ? bodyIfNotEmpty : null); - }; - VirtualConnectionsCollection.prototype._getOrOpenVirtualConnection = function (header) { - if (this._virtualConnections.hasOwnProperty(header.connectionIdString)) { - // It's an existing virtual connection - return this._virtualConnections[header.connectionIdString]; - } - else { - // It's a new one - return this._openVirtualConnection(header); - } - }; - VirtualConnectionsCollection.prototype._openVirtualConnection = function (header) { - var _this = this; - var beginWriteCallback = function (data, writeCompletedCallback) { - // Only send nonempty frames, since empty ones are a signal to close the virtual connection - if (data.length > 0) { - _this._sendFrame(header.connectionIdBinary, data, writeCompletedCallback); - } - }; - var newVirtualConnection = new VirtualConnection_1.VirtualConnection(beginWriteCallback); - newVirtualConnection.on('end', function () { - // The virtual connection was closed remotely. Clean up locally. - _this._onVirtualConnectionWasClosed(header.connectionIdString); - }); - newVirtualConnection.on('finish', function () { - // The virtual connection was closed locally. Clean up locally, and notify the remote that we're done. - _this._onVirtualConnectionWasClosed(header.connectionIdString); - _this._sendFrame(header.connectionIdBinary, new Buffer(0)); - }); - this._virtualConnections[header.connectionIdString] = newVirtualConnection; - this._onVirtualConnectionCallback(newVirtualConnection); - return newVirtualConnection; - }; - /** - * Attempts to read a complete frame header, synchronously, from the underlying socket. - * If not enough data is available synchronously, returns null without consuming any data from the socket. - */ - VirtualConnectionsCollection.prototype._readNextFrameHeader = function () { - var headerBuf = this._socket.read(12); - if (headerBuf !== null) { - // We have enough data synchronously - var connectionIdBinary = headerBuf.slice(0, 8); - var connectionIdString = connectionIdBinary.toString('hex'); - var bodyLength = headerBuf.readInt32LE(8); - if (bodyLength < 0 || bodyLength > MaxFrameBodyLength) { - // Throwing here is going to bring down the whole process, so this cannot be allowed to happen in real use. - // But it won't happen in real use, because this is only used with our .NET client, which doesn't violate this rule. - throw new Error('Illegal frame body length: ' + bodyLength); - } - return { connectionIdBinary: connectionIdBinary, connectionIdString: connectionIdString, bodyLength: bodyLength }; - } - else { - // Not enough bytes are available synchronously, so none were consumed - return null; - } - }; - VirtualConnectionsCollection.prototype._sendFrame = function (connectionIdBinary, data, callback) { - // For all sends other than the last one, only invoke the callback if it failed. - // Also, only invoke the callback at most once. - var hasInvokedCallback = false; - var finalCallback = callback && (function (error) { - if (!hasInvokedCallback) { - hasInvokedCallback = true; - callback(error); - } - }); - var notFinalCallback = callback && (function (error) { - if (error) { - finalCallback(error); - } - }); - // The amount of data we're writing might exceed MaxFrameBodyLength, so split into frames as needed. - // Note that we always send at least one frame, even if it's empty (because that's the close-virtual-connection signal). - // If needed, this could be changed to send frames asynchronously, so that large sends could proceed in parallel - // (though that would involve making a clone of 'data', to avoid the risk of it being mutated during the send). - var bytesSent = 0; - do { - var nextFrameBodyLength = Math.min(MaxFrameBodyLength, data.length - bytesSent); - var isFinalChunk = (bytesSent + nextFrameBodyLength) === data.length; - this._socket.write(connectionIdBinary, notFinalCallback); - this._sendInt32LE(nextFrameBodyLength, notFinalCallback); - this._socket.write(data.slice(bytesSent, bytesSent + nextFrameBodyLength), isFinalChunk ? finalCallback : notFinalCallback); - bytesSent += nextFrameBodyLength; - } while (bytesSent < data.length); - }; - /** - * Sends a number serialized in the correct format for .NET to receive as a System.Int32 - */ - VirtualConnectionsCollection.prototype._sendInt32LE = function (value, callback) { - var buf = new Buffer(4); - buf.writeInt32LE(value, 0); - this._socket.write(buf, callback); - }; - VirtualConnectionsCollection.prototype._onVirtualConnectionWasClosed = function (id) { - if (this._virtualConnections.hasOwnProperty(id)) { - delete this._virtualConnections[id]; - } - }; - return VirtualConnectionsCollection; - }()); - - -/***/ }, -/* 9 */ -/***/ function(module, exports) { - - module.exports = require("events"); - -/***/ }, -/* 10 */ -/***/ function(module, exports, __webpack_require__) { - - "use strict"; - var __extends = (this && this.__extends) || function (d, b) { - for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; - var stream_1 = __webpack_require__(11); - /** - * Represents a virtual connection. Multiple virtual connections may be multiplexed over a single physical socket connection. - */ - var VirtualConnection = (function (_super) { - __extends(VirtualConnection, _super); - function VirtualConnection(_beginWriteCallback) { - var _this = _super.call(this) || this; - _this._beginWriteCallback = _beginWriteCallback; - _this._flowing = false; - _this._receivedDataQueue = []; - return _this; - } - VirtualConnection.prototype._read = function () { - this._flowing = true; - // Keep pushing data until we run out, or the underlying framework asks us to stop. - // When we finish, the 'flowing' state is detemined by whether more data is still being requested. - while (this._flowing && this._receivedDataQueue.length > 0) { - var nextChunk = this._receivedDataQueue.shift(); - this._flowing = this.push(nextChunk); - } - }; - VirtualConnection.prototype._write = function (chunk, encodingIfString, callback) { - if (typeof chunk === 'string') { - chunk = new Buffer(chunk, encodingIfString); - } - this._beginWriteCallback(chunk, callback); - }; - VirtualConnection.prototype.onReceivedData = function (dataOrNullToSignalEOF) { - if (this._flowing) { - this._flowing = this.push(dataOrNullToSignalEOF); - } - else { - this._receivedDataQueue.push(dataOrNullToSignalEOF); - } - }; - return VirtualConnection; - }(stream_1.Duplex)); - exports.VirtualConnection = VirtualConnection; - - -/***/ }, -/* 11 */ -/***/ function(module, exports) { - - module.exports = require("stream"); - -/***/ } -/******/ ]))); \ No newline at end of file diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj deleted file mode 100644 index 9dab54a95d..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - Socket-based RPC for Microsoft.AspNetCore.NodeServices. - netstandard2.0 - - - - - - - - - - - - - - - - - - - - - diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/NamedPipeConnection.cs b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/NamedPipeConnection.cs deleted file mode 100644 index 5fcd667907..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/NamedPipeConnection.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.IO; -using System.IO.Pipes; -using System.Threading.Tasks; - -namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections -{ - internal class NamedPipeConnection : StreamConnection - { - private bool _disposedValue = false; - private NamedPipeClientStream _namedPipeClientStream; - -#pragma warning disable 1998 // Because in the NET451 code path, there's nothing to await - public override async Task Open(string address) - { - _namedPipeClientStream = new NamedPipeClientStream( - ".", - address, - PipeDirection.InOut, - PipeOptions.Asynchronous); - - await _namedPipeClientStream.ConnectAsync().ConfigureAwait(false); - - return _namedPipeClientStream; - } -#pragma warning restore 1998 - - public override void Dispose() - { - if (!_disposedValue) - { - if (_namedPipeClientStream != null) - { - _namedPipeClientStream.Dispose(); - } - - _disposedValue = true; - } - } - } -} \ No newline at end of file diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/StreamConnection.cs b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/StreamConnection.cs deleted file mode 100644 index cbd1f9902a..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/StreamConnection.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.IO; -using System.Threading.Tasks; - -namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections -{ - internal abstract class StreamConnection : IDisposable - { - public abstract Task Open(string address); - public abstract void Dispose(); - - public static StreamConnection Create() - { - var useNamedPipes = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform( - System.Runtime.InteropServices.OSPlatform.Windows); - if (useNamedPipes) - { - return new NamedPipeConnection(); - } - else - { - return new UnixDomainSocketConnection(); - } - } - } -} \ No newline at end of file diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketConnection.cs b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketConnection.cs deleted file mode 100644 index 6e7ebaceb4..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketConnection.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.IO; -using System.Net.Sockets; -using System.Threading.Tasks; - -namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections -{ - internal class UnixDomainSocketConnection : StreamConnection - { - private bool _disposedValue = false; - private NetworkStream _networkStream; - private Socket _socket; - - public override async Task Open(string address) - { - var endPoint = new UnixDomainSocketEndPoint("/tmp/" + address); - _socket = new Socket(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Unspecified); - await _socket.ConnectAsync(endPoint).ConfigureAwait(false); - _networkStream = new NetworkStream(_socket); - return _networkStream; - } - - public override void Dispose() - { - if (!_disposedValue) - { - if (_networkStream != null) - { - _networkStream.Dispose(); - } - - if (_socket != null) - { - _socket.Dispose(); - } - - _disposedValue = true; - } - } - } -} \ No newline at end of file diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketEndPoint.cs b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketEndPoint.cs deleted file mode 100644 index b001163293..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketEndPoint.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System; -using System.Net; -using System.Net.Sockets; -using System.Text; - -namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections -{ - // From System.IO.Pipes/src/System/Net/Sockets/UnixDomainSocketEndPoint.cs (an internal class in System.IO.Pipes) - internal sealed class UnixDomainSocketEndPoint : EndPoint - { - private const AddressFamily EndPointAddressFamily = AddressFamily.Unix; - - private static readonly Encoding s_pathEncoding = Encoding.UTF8; - private static readonly int s_nativePathOffset = 2; // = offsetof(struct sockaddr_un, sun_path). It's the same on Linux and OSX - private static readonly int s_nativePathLength = 91; // sockaddr_un.sun_path at http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_un.h.html, -1 for terminator - private static readonly int s_nativeAddressSize = s_nativePathOffset + s_nativePathLength; - - private readonly string _path; - private readonly byte[] _encodedPath; - - public UnixDomainSocketEndPoint(string path) - { - if (path == null) - { - throw new ArgumentNullException(nameof(path)); - } - - _path = path; - _encodedPath = s_pathEncoding.GetBytes(_path); - - if (path.Length == 0 || _encodedPath.Length > s_nativePathLength) - { - throw new ArgumentOutOfRangeException(nameof(path)); - } - } - - internal UnixDomainSocketEndPoint(SocketAddress socketAddress) - { - if (socketAddress == null) - { - throw new ArgumentNullException(nameof(socketAddress)); - } - - if (socketAddress.Family != EndPointAddressFamily || - socketAddress.Size > s_nativeAddressSize) - { - throw new ArgumentOutOfRangeException(nameof(socketAddress)); - } - - if (socketAddress.Size > s_nativePathOffset) - { - _encodedPath = new byte[socketAddress.Size - s_nativePathOffset]; - for (int i = 0; i < _encodedPath.Length; i++) - { - _encodedPath[i] = socketAddress[s_nativePathOffset + i]; - } - - _path = s_pathEncoding.GetString(_encodedPath, 0, _encodedPath.Length); - } - else - { - _encodedPath = Array.Empty(); - _path = string.Empty; - } - } - - public override SocketAddress Serialize() - { - var result = new SocketAddress(AddressFamily.Unix, s_nativeAddressSize); - - for (int index = 0; index < _encodedPath.Length; index++) - { - result[s_nativePathOffset + index] = _encodedPath[index]; - } - result[s_nativePathOffset + _encodedPath.Length] = 0; // path must be null-terminated - - return result; - } - - public override EndPoint Create(SocketAddress socketAddress) => new UnixDomainSocketEndPoint(socketAddress); - - public override AddressFamily AddressFamily => EndPointAddressFamily; - - public override string ToString() => _path; - } -} \ No newline at end of file diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs deleted file mode 100644 index 7559ae29db..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs +++ /dev/null @@ -1,240 +0,0 @@ -using System.IO; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.NodeServices.HostingModels; -using Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections; -using Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using Newtonsoft.Json.Serialization; - -namespace Microsoft.AspNetCore.NodeServices.Sockets -{ - /// - /// A specialisation of the OutOfProcessNodeInstance base class that uses a lightweight binary streaming protocol - /// to perform RPC invocations. The physical transport is Named Pipes on Windows, or Domain Sockets on Linux/Mac. - /// For details on the binary streaming protocol, see - /// The advantage versus using HTTP for RPC is that this is faster (not surprisingly - there's much less overhead - /// because we don't need most of the functionality of HTTP. - /// - /// The address of the pipe/socket is selected randomly here on the .NET side and sent to the child process as a - /// command-line argument (the address space is wide enough that there's no real risk of a clash, unlike when - /// selecting TCP port numbers). - /// - /// - internal class SocketNodeInstance : OutOfProcessNodeInstance - { - private readonly static JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings - { - ContractResolver = new CamelCasePropertyNamesContractResolver(), - TypeNameHandling = TypeNameHandling.None - }; - - private readonly static int streamBufferSize = 16 * 1024; - private readonly static UTF8Encoding utf8EncodingWithoutBom = new UTF8Encoding(false); - - private readonly SemaphoreSlim _connectionCreationSemaphore = new SemaphoreSlim(1); - private bool _connectionHasFailed; - private StreamConnection _physicalConnection; - private string _socketAddress; - private VirtualConnectionClient _virtualConnectionClient; - - public SocketNodeInstance(NodeServicesOptions options, string socketAddress) - : base( - EmbeddedResourceReader.Read( - typeof(SocketNodeInstance), - "/Content/Node/entrypoint-socket.js"), - options.ProjectPath, - options.WatchFileExtensions, - MakeNewCommandLineOptions(socketAddress), - options.ApplicationStoppingToken, - options.NodeInstanceOutputLogger, - options.EnvironmentVariables, - options.InvocationTimeoutMilliseconds, - options.LaunchWithDebugging, - options.DebuggingPort) - { - _socketAddress = socketAddress; - } - - protected override async Task InvokeExportAsync(NodeInvocationInfo invocationInfo, CancellationToken cancellationToken) - { - if (_connectionHasFailed) - { - // _connectionHasFailed implies a protocol-level error. The old instance is no longer of any use. - var allowConnectionDraining = false; - - // This special exception type forces NodeServicesImpl to restart the Node instance - throw new NodeInvocationException( - "The SocketNodeInstance socket connection failed. See logs to identify the reason.", - details: null, - nodeInstanceUnavailable: true, - allowConnectionDraining: allowConnectionDraining); - } - - if (_virtualConnectionClient == null) - { - // Although we could pass the cancellationToken into EnsureVirtualConnectionClientCreated and - // have it signal cancellations upstream, that would be a bad thing to do, because all callers - // wait for the same connection task. There's no reason why the first caller should have the - // special ability to cancel the connection process in a way that would affect subsequent - // callers. So, each caller just independently stops awaiting connection if that call is cancelled. - await ThrowOnCancellation(EnsureVirtualConnectionClientCreated(), cancellationToken); - } - - // For each invocation, we open a new virtual connection. This gives an API equivalent to opening a new - // physical connection to the child process, but without the overhead of doing so, because it's really - // just multiplexed into the existing physical connection stream. - bool shouldDisposeVirtualConnection = true; - Stream virtualConnection = null; - try - { - virtualConnection = _virtualConnectionClient.OpenVirtualConnection(); - - // Send request - WriteJsonLine(virtualConnection, invocationInfo); - - // Determine what kind of response format is expected - if (typeof(T) == typeof(Stream)) - { - // Pass through streamed binary response - // It is up to the consumer to dispose this stream, so don't do so here - shouldDisposeVirtualConnection = false; - return (T)(object)virtualConnection; - } - else - { - // Parse and return non-streamed JSON response - var response = await ReadJsonAsync>(virtualConnection, cancellationToken); - if (response.ErrorMessage != null) - { - throw new NodeInvocationException(response.ErrorMessage, response.ErrorDetails); - } - - return response.Result; - } - } - finally - { - if (shouldDisposeVirtualConnection) - { - virtualConnection.Dispose(); - } - } - } - - private async Task EnsureVirtualConnectionClientCreated() - { - // Asynchronous equivalent to a 'lock(...) { ... }' - await _connectionCreationSemaphore.WaitAsync(); - try - { - if (_virtualConnectionClient == null) - { - _physicalConnection = StreamConnection.Create(); - - var connection = await _physicalConnection.Open(_socketAddress); - _virtualConnectionClient = new VirtualConnectionClient(connection); - _virtualConnectionClient.OnError += (ex) => - { - // This callback is fired only if there's a protocol-level failure (e.g., child process disconnected - // unexpectedly). It does *not* fire when RPC calls return errors. Since there's been a protocol-level - // failure, this Node instance is no longer usable and should be discarded. - _connectionHasFailed = true; - - OutputLogger.LogError(0, ex, ex.Message); - }; - } - } - finally - { - _connectionCreationSemaphore.Release(); - } - } - - protected override void Dispose(bool disposing) - { - if (disposing) - { - if (_virtualConnectionClient != null) - { - _virtualConnectionClient.Dispose(); - _virtualConnectionClient = null; - } - - if (_physicalConnection != null) - { - _physicalConnection.Dispose(); - _physicalConnection = null; - } - } - - base.Dispose(disposing); - } - - private static void WriteJsonLine(Stream stream, object serializableObject) - { - using (var streamWriter = new StreamWriter(stream, utf8EncodingWithoutBom, streamBufferSize, true)) - using (var jsonWriter = new JsonTextWriter(streamWriter)) - { - jsonWriter.CloseOutput = false; - jsonWriter.AutoCompleteOnClose = false; - - var serializer = JsonSerializer.Create(jsonSerializerSettings); - serializer.Serialize(jsonWriter, serializableObject); - jsonWriter.Flush(); - - streamWriter.WriteLine(); - streamWriter.Flush(); - } - } - - private static async Task ReadJsonAsync(Stream stream, CancellationToken cancellationToken) - { - var json = Encoding.UTF8.GetString(await ReadAllBytesAsync(stream, cancellationToken)); - return JsonConvert.DeserializeObject(json, jsonSerializerSettings); - } - - private static async Task ReadAllBytesAsync(Stream input, CancellationToken cancellationToken) - { - byte[] buffer = new byte[streamBufferSize]; - - using (var ms = new MemoryStream()) - { - int read; - while ((read = await input.ReadAsync(buffer, 0, buffer.Length, cancellationToken)) > 0) - { - ms.Write(buffer, 0, read); - } - - return ms.ToArray(); - } - } - - private static string MakeNewCommandLineOptions(string listenAddress) - { - return $"--listenAddress {listenAddress}"; - } - - private static Task ThrowOnCancellation(Task task, CancellationToken cancellationToken) - { - return task.IsCompleted - ? task // If the task is already completed, no need to wrap it in a further layer of task - : task.ContinueWith( - _ => {}, // If the task completes, allow execution to continue - cancellationToken, - TaskContinuationOptions.ExecuteSynchronously, - TaskScheduler.Default); - } - -#pragma warning disable 649 // These properties are populated via JSON deserialization - private class RpcJsonResponse - { - public TResult Result { get; set; } - public string ErrorMessage { get; set; } - public string ErrorDetails { get; set; } - } -#pragma warning restore 649 - } -} diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeServicesOptionsExtensions.cs b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeServicesOptionsExtensions.cs deleted file mode 100644 index 4535638678..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeServicesOptionsExtensions.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; - -namespace Microsoft.AspNetCore.NodeServices.Sockets -{ - /// - /// Extension methods that help with populating a object. - /// - public static class NodeServicesOptionsExtensions - { - /// - /// Configures the service so that it will use out-of-process - /// Node.js instances and perform RPC calls over binary sockets (on Windows, this is - /// implemented as named pipes; on other platforms it uses domain sockets). - /// - public static void UseSocketHosting(this NodeServicesOptions options) - { - var pipeName = "pni-" + Guid.NewGuid().ToString("D"); // Arbitrary non-clashing string - options.NodeInstanceFactory = () => new SocketNodeInstance(options, pipeName); - } - } -} \ No newline at end of file diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts deleted file mode 100644 index dccc63b099..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts +++ /dev/null @@ -1,79 +0,0 @@ -// Limit dependencies to core Node modules. This means the code in this file has to be very low-level and unattractive, -// but simplifies things for the consumer of this module. -import '../../Microsoft.AspNetCore.NodeServices/TypeScript/Util/OverrideStdOutputs'; -import * as net from 'net'; -import * as path from 'path'; -import * as readline from 'readline'; -import { Duplex } from 'stream'; -import { parseArgs } from '../../Microsoft.AspNetCore.NodeServices/TypeScript/Util/ArgsUtil'; -import { exitWhenParentExits } from '../../Microsoft.AspNetCore.NodeServices/TypeScript/Util/ExitWhenParentExits'; -import * as virtualConnectionServer from './VirtualConnections/VirtualConnectionServer'; - -// Webpack doesn't support dynamic requires for files not present at compile time, so grab a direct -// reference to Node's runtime 'require' function. -const dynamicRequire: (name: string) => any = eval('require'); - -// Signal to the .NET side when we're ready to accept invocations -const server = net.createServer().on('listening', () => { - console.log('[Microsoft.AspNetCore.NodeServices:Listening]'); -}); - -// Each virtual connection represents a separate invocation -virtualConnectionServer.createInterface(server).on('connection', (connection: Duplex) => { - readline.createInterface(connection, null).on('line', line => { - try { - // Get a reference to the function to invoke - const invocation = JSON.parse(line) as RpcInvocation; - const invokedModule = dynamicRequire(path.resolve(process.cwd(), invocation.moduleName)); - const invokedFunction = invocation.exportedFunctionName ? invokedModule[invocation.exportedFunctionName] : invokedModule; - - // Prepare a callback for accepting non-streamed JSON responses - let hasInvokedCallback = false; - const invocationCallback = (errorValue, successValue) => { - if (hasInvokedCallback) { - throw new Error('Cannot supply more than one result. The callback has already been invoked,' - + ' or the result stream has already been accessed'); - } - - hasInvokedCallback = true; - connection.end(JSON.stringify({ - result: successValue, - errorMessage: errorValue && (errorValue.message || errorValue), - errorDetails: errorValue && (errorValue.stack || null) - })); - }; - - // Also support streamed binary responses - Object.defineProperty(invocationCallback, 'stream', { - enumerable: true, - get: (): Duplex => { - hasInvokedCallback = true; - return connection; - } - }); - - // Actually invoke it, passing through any supplied args - invokedFunction.apply(null, [invocationCallback].concat(invocation.args)); - } catch (ex) { - connection.end(JSON.stringify({ - errorMessage: ex.message, - errorDetails: ex.stack - })); - } - }); -}); - -// Begin listening now. The underlying transport varies according to the runtime platform. -// On Windows it's Named Pipes; on Linux/OSX it's Domain Sockets. -const useWindowsNamedPipes = /^win/.test(process.platform); -const parsedArgs = parseArgs(process.argv); -const listenAddress = (useWindowsNamedPipes ? '\\\\.\\pipe\\' : '/tmp/') + parsedArgs.listenAddress; -server.listen(listenAddress); - -exitWhenParentExits(parseInt(parsedArgs.parentPid), /* ignoreSigint */ true); - -interface RpcInvocation { - moduleName: string; - exportedFunctionName: string; - args: any[]; -} diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnection.ts b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnection.ts deleted file mode 100644 index de71f607ea..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnection.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { Duplex } from 'stream'; - -export type EndWriteCallback = (error?: any) => void; -export type BeginWriteCallback = (data: Buffer, callback: EndWriteCallback) => void; - -/** - * Represents a virtual connection. Multiple virtual connections may be multiplexed over a single physical socket connection. - */ -export class VirtualConnection extends Duplex { - private _flowing = false; - private _receivedDataQueue: Buffer[] = []; - - constructor(private _beginWriteCallback: BeginWriteCallback) { - super(); - } - - public _read() { - this._flowing = true; - - // Keep pushing data until we run out, or the underlying framework asks us to stop. - // When we finish, the 'flowing' state is detemined by whether more data is still being requested. - while (this._flowing && this._receivedDataQueue.length > 0) { - const nextChunk = this._receivedDataQueue.shift(); - this._flowing = this.push(nextChunk); - } - } - - public _write(chunk: Buffer | string, encodingIfString: string, callback: EndWriteCallback) { - if (typeof chunk === 'string') { - chunk = new Buffer(chunk as string, encodingIfString); - } - - this._beginWriteCallback(chunk as Buffer, callback); - } - - public onReceivedData(dataOrNullToSignalEOF: Buffer) { - if (this._flowing) { - this._flowing = this.push(dataOrNullToSignalEOF); - } else { - this._receivedDataQueue.push(dataOrNullToSignalEOF); - } - } -} diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnectionServer.ts b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnectionServer.ts deleted file mode 100644 index 76b833d4ab..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnectionServer.ts +++ /dev/null @@ -1,199 +0,0 @@ -import { Server, Socket } from 'net'; -import { EventEmitter } from 'events'; -import { Duplex } from 'stream'; -import { VirtualConnection, EndWriteCallback } from './VirtualConnection'; - -// Keep this in sync with the equivalent constant in the .NET code. Both sides split up their transmissions into frames with this max length, -// and both will reject longer frames. -const MaxFrameBodyLength = 16 * 1024; - -/** - * Accepts connections to a net.Server and adapts them to behave as multiplexed connections. That is, for each physical socket connection, - * we track a list of 'virtual connections' whose API is a Duplex stream. The remote clients may open and close as many virtual connections - * as they wish, reading and writing to them independently, without the overhead of establishing new physical connections each time. - */ -export function createInterface(server: Server): EventEmitter { - const emitter = new EventEmitter(); - - server.on('connection', (socket: Socket) => { - // For each physical socket connection, maintain a set of virtual connections. Issue a notification whenever - // a new virtual connections is opened. - const childSockets = new VirtualConnectionsCollection(socket, virtualConnection => { - emitter.emit('connection', virtualConnection); - }); - }); - - return emitter; -} - -/** - * Tracks the 'virtual connections' associated with a single physical socket connection. - */ -class VirtualConnectionsCollection { - private _currentFrameHeader: FrameHeader = null; - private _virtualConnections: { [id: string]: VirtualConnection } = {}; - - constructor(private _socket: Socket, private _onVirtualConnectionCallback: (virtualConnection: Duplex) => void) { - // If the remote end closes the physical socket, treat all the virtual connections as being closed remotely too - this._socket.on('close', () => { - Object.getOwnPropertyNames(this._virtualConnections).forEach(id => { - // A 'null' frame signals that the connection was closed remotely - this._virtualConnections[id].onReceivedData(null); - }); - }); - - this._socket.on('readable', this._onIncomingDataAvailable.bind(this)); - } - - /** - * This is called whenever the underlying socket signals that it may have some data available to read. It will synchronously read as many - * message frames as it can from the underlying socket, opens virtual connections as needed, and dispatches data to them. - */ - private _onIncomingDataAvailable() { - let exhaustedAllData = false; - - while (!exhaustedAllData) { - // We might already have a pending frame header from the previous time this method ran, but if not, that's the next thing we need to read - if (this._currentFrameHeader === null) { - this._currentFrameHeader = this._readNextFrameHeader(); - } - - if (this._currentFrameHeader === null) { - // There's not enough data to fill a frameheader, so wait until more arrives later - // The next attempt to read from the socket will start from the same place this one did (incomplete reads don't consume any data) - exhaustedAllData = true; - } else { - const frameBodyLength = this._currentFrameHeader.bodyLength; - const frameBodyOrNull: Buffer = frameBodyLength > 0 ? this._socket.read(this._currentFrameHeader.bodyLength) : null; - if (frameBodyOrNull !== null || frameBodyLength === 0) { - // We have a complete frame header+body pair, so we can now dispatch this to a virtual connection. We set _currentFrameHeader back to null - // so that the next thing we try to read is the next frame header. - const headerCopy = this._currentFrameHeader; - this._currentFrameHeader = null; - this._onReceivedCompleteFrame(headerCopy, frameBodyOrNull); - } else { - // There's not enough data to fill the pending frame body, so wait until more arrives later - // The next attempt to read from the socket will start from the same place this one did (incomplete reads don't consume any data) - exhaustedAllData = true; - } - } - } - } - - private _onReceivedCompleteFrame(header: FrameHeader, bodyIfNotEmpty: Buffer) { - // An incoming zero-length frame signals that there's no more data to read. - // Signal this to the Node stream APIs by pushing a 'null' chunk to it. - const virtualConnection = this._getOrOpenVirtualConnection(header); - virtualConnection.onReceivedData(header.bodyLength > 0 ? bodyIfNotEmpty : null); - } - - private _getOrOpenVirtualConnection(header: FrameHeader) { - if (this._virtualConnections.hasOwnProperty(header.connectionIdString)) { - // It's an existing virtual connection - return this._virtualConnections[header.connectionIdString]; - } else { - // It's a new one - return this._openVirtualConnection(header); - } - } - - private _openVirtualConnection(header: FrameHeader) { - const beginWriteCallback = (data, writeCompletedCallback) => { - // Only send nonempty frames, since empty ones are a signal to close the virtual connection - if (data.length > 0) { - this._sendFrame(header.connectionIdBinary, data, writeCompletedCallback); - } - }; - - const newVirtualConnection = new VirtualConnection(beginWriteCallback); - newVirtualConnection.on('end', () => { - // The virtual connection was closed remotely. Clean up locally. - this._onVirtualConnectionWasClosed(header.connectionIdString); - }); - newVirtualConnection.on('finish', () => { - // The virtual connection was closed locally. Clean up locally, and notify the remote that we're done. - this._onVirtualConnectionWasClosed(header.connectionIdString); - this._sendFrame(header.connectionIdBinary, new Buffer(0)); - }); - - this._virtualConnections[header.connectionIdString] = newVirtualConnection; - this._onVirtualConnectionCallback(newVirtualConnection); - return newVirtualConnection; - } - - /** - * Attempts to read a complete frame header, synchronously, from the underlying socket. - * If not enough data is available synchronously, returns null without consuming any data from the socket. - */ - private _readNextFrameHeader(): FrameHeader { - const headerBuf: Buffer = this._socket.read(12); - if (headerBuf !== null) { - // We have enough data synchronously - const connectionIdBinary = headerBuf.slice(0, 8); - const connectionIdString = connectionIdBinary.toString('hex'); - const bodyLength = headerBuf.readInt32LE(8); - if (bodyLength < 0 || bodyLength > MaxFrameBodyLength) { - // Throwing here is going to bring down the whole process, so this cannot be allowed to happen in real use. - // But it won't happen in real use, because this is only used with our .NET client, which doesn't violate this rule. - throw new Error('Illegal frame body length: ' + bodyLength); - } - - return { connectionIdBinary, connectionIdString, bodyLength }; - } else { - // Not enough bytes are available synchronously, so none were consumed - return null; - } - } - - private _sendFrame(connectionIdBinary: Buffer, data: Buffer, callback?: EndWriteCallback) { - // For all sends other than the last one, only invoke the callback if it failed. - // Also, only invoke the callback at most once. - let hasInvokedCallback = false; - const finalCallback: EndWriteCallback = callback && (error => { - if (!hasInvokedCallback) { - hasInvokedCallback = true; - callback(error); - } - }); - const notFinalCallback: EndWriteCallback = callback && (error => { - if (error) { - finalCallback(error); - } - }); - - // The amount of data we're writing might exceed MaxFrameBodyLength, so split into frames as needed. - // Note that we always send at least one frame, even if it's empty (because that's the close-virtual-connection signal). - // If needed, this could be changed to send frames asynchronously, so that large sends could proceed in parallel - // (though that would involve making a clone of 'data', to avoid the risk of it being mutated during the send). - let bytesSent = 0; - do { - const nextFrameBodyLength = Math.min(MaxFrameBodyLength, data.length - bytesSent); - const isFinalChunk = (bytesSent + nextFrameBodyLength) === data.length; - this._socket.write(connectionIdBinary, notFinalCallback); - this._sendInt32LE(nextFrameBodyLength, notFinalCallback); - this._socket.write(data.slice(bytesSent, bytesSent + nextFrameBodyLength), isFinalChunk ? finalCallback : notFinalCallback); - bytesSent += nextFrameBodyLength; - } while (bytesSent < data.length); - } - - /** - * Sends a number serialized in the correct format for .NET to receive as a System.Int32 - */ - private _sendInt32LE(value: number, callback?: EndWriteCallback) { - const buf = new Buffer(4); - buf.writeInt32LE(value, 0); - this._socket.write(buf, callback); - } - - private _onVirtualConnectionWasClosed(id: string) { - if (this._virtualConnections.hasOwnProperty(id)) { - delete this._virtualConnections[id]; - } - } -} - -interface FrameHeader { - connectionIdBinary: Buffer; - connectionIdString: string; - bodyLength: number; -} diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/tsconfig.json b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/tsconfig.json deleted file mode 100644 index 896fc88253..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "compilerOptions": { - "target": "es3", - "module": "commonjs", - "moduleResolution": "node", - "types": ["node"] - }, - "exclude": [ - "node_modules" - ] -} diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs deleted file mode 100644 index 391b1f760d..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs +++ /dev/null @@ -1,150 +0,0 @@ -using System; -using System.IO; -using System.Threading; -using System.Threading.Tasks; -using System.Threading.Tasks.Dataflow; - -namespace Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections -{ - /// - /// A virtual read/write connection, typically to a remote process. Multiple virtual connections can be - /// multiplexed over a single physical connection (e.g., a named pipe, domain socket, or TCP socket). - /// - internal class VirtualConnection : Stream - { - private readonly static Task CompletedTask = Task.CompletedTask; - private VirtualConnectionClient _host; - private readonly BufferBlock _receivedDataQueue = new BufferBlock(); - private ArraySegment _receivedDataNotYetUsed; - private bool _wasClosedByRemote; - private bool _isDisposed; - - public VirtualConnection(long id, VirtualConnectionClient host) - { - Id = id; - _host = host; - } - - public long Id { get; } - - public override bool CanRead { get { return true; } } - public override bool CanSeek { get { return false; } } - public override bool CanWrite { get { return true; } } - - public override long Length - { - get { throw new NotImplementedException(); } - } - - public override long Position - { - get { throw new NotImplementedException(); } - set { throw new NotImplementedException(); } - } - - public override void Flush() - { - // We're auto-flushing, so this is a no-op. - } - - public override async Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - if (_wasClosedByRemote) - { - return 0; - } - - var bytesRead = 0; - while (true) - { - // Pull as many applicable bytes as we can out of receivedDataNotYetUsed, then update its offset/length - int bytesToExtract = Math.Min(count - bytesRead, _receivedDataNotYetUsed.Count); - if (bytesToExtract > 0) - { - Buffer.BlockCopy(_receivedDataNotYetUsed.Array, _receivedDataNotYetUsed.Offset, buffer, bytesRead, bytesToExtract); - _receivedDataNotYetUsed = new ArraySegment(_receivedDataNotYetUsed.Array, _receivedDataNotYetUsed.Offset + bytesToExtract, _receivedDataNotYetUsed.Count - bytesToExtract); - bytesRead += bytesToExtract; - } - - // If we've completely filled the output buffer, we're done - if (bytesRead == count) - { - return bytesRead; - } - - // We haven't yet filled the output buffer, so we must have exhausted receivedDataNotYetUsed instead. - // We want to get the next block of data from the underlying queue. - byte[] nextReceivedBlock; - if (bytesRead > 0) - { - if (!_receivedDataQueue.TryReceive(null, out nextReceivedBlock)) - { - // No more data is available synchronously, and we already have some data, so we can stop now - return bytesRead; - } - } - else - { - // Since we don't yet have anything, wait for the underlying source - nextReceivedBlock = await _receivedDataQueue.ReceiveAsync(cancellationToken); - } - - if (nextReceivedBlock.Length == 0) - { - // A zero-length block signals that the remote regards this virtual connection as closed - _wasClosedByRemote = true; - return bytesRead; - } - else - { - // We got some more data, so can continue trying to fill the output buffer - _receivedDataNotYetUsed = new ArraySegment(nextReceivedBlock, 0, nextReceivedBlock.Length); - } - } - } - - public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - if (_wasClosedByRemote) - { - throw new InvalidOperationException("The connection was already closed by the remote party"); - } - - return count > 0 ? _host.WriteAsync(Id, buffer, offset, count, cancellationToken) : CompletedTask; - } - - public override int Read(byte[] buffer, int offset, int count) - { - return ReadAsync(buffer, offset, count, CancellationToken.None).Result; - } - - public override long Seek(long offset, SeekOrigin origin) - { - throw new NotImplementedException(); - } - - public override void SetLength(long value) - { - throw new NotImplementedException(); - } - - public override void Write(byte[] buffer, int offset, int count) - { - WriteAsync(buffer, offset, count, CancellationToken.None).Wait(); - } - - protected override void Dispose(bool disposing) - { - if (disposing && !_isDisposed) - { - _isDisposed = true; - _host.CloseInnerStream(Id, _wasClosedByRemote); - } - } - - public async Task AddDataToQueue(byte[] data) - { - await _receivedDataQueue.SendAsync(data); - } - } -} \ No newline at end of file diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnectionClient.cs b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnectionClient.cs deleted file mode 100644 index 48ec967758..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnectionClient.cs +++ /dev/null @@ -1,238 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; - -namespace Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections -{ - /// - /// A callback that will be invoked if the encounters a read error. - /// - /// - public delegate void VirtualConnectionReadErrorHandler(Exception ex); - - /// - /// Wraps an underlying physical read/write stream (e.g., named pipes, domain sockets, or TCP sockets) and - /// exposes an API for making 'virtual connections', which act as independent read/write streams. - /// Traffic over these virtual connections is multiplexed over the underlying physical stream. This is useful - /// for fast stream-based inter-process communication because it avoids the overhead of opening a new physical - /// connection each time a new communication channel is needed. - /// - internal class VirtualConnectionClient : IDisposable - { - internal const int MaxFrameBodyLength = 16 * 1024; - - public event VirtualConnectionReadErrorHandler OnError; - - private Stream _underlyingTransport; - private Dictionary _activeInnerStreams; - private long _nextInnerStreamId; - private readonly SemaphoreSlim _streamWriterSemaphore = new SemaphoreSlim(1); - private readonly object _readControlLock = new object(); - private Exception _readLoopExitedWithException; - private readonly CancellationTokenSource _disposalCancellatonToken = new CancellationTokenSource(); - private bool _disposedValue = false; - - public VirtualConnectionClient(Stream underlyingTransport) - { - _underlyingTransport = underlyingTransport; - _activeInnerStreams = new Dictionary(); - - RunReadLoop(); - } - - public Stream OpenVirtualConnection() - { - // Improve discoverability of read-loop errors (in case the developer doesn't add an OnError listener) - ThrowIfReadLoopFailed(); - - var id = Interlocked.Increment(ref _nextInnerStreamId); - var newInnerStream = new VirtualConnection(id, this); - lock (_activeInnerStreams) - { - _activeInnerStreams.Add(id, newInnerStream); - } - - return newInnerStream; - } - - // It's async void because nothing waits for it to finish (it continues indefinitely). It signals any errors via - // a separate channel. - private async void RunReadLoop() - { - try - { - while (!_disposalCancellatonToken.IsCancellationRequested) - { - var remoteIsStillConnected = await ProcessNextFrameAsync(); - if (!remoteIsStillConnected) - { - CloseAllActiveStreams(); - } - } - } - catch (Exception ex) - { - // Not all underlying transports correctly honor cancellation tokens. For example, - // DomainSocketStreamTransport's ReadAsync ignores them, so we only know to stop - // the read loop when the underlying stream is disposed and then it throws ObjectDisposedException. - if (!(ex is TaskCanceledException || ex is ObjectDisposedException)) - { - _readLoopExitedWithException = ex; - - var evt = OnError; - if (evt != null) - { - evt(ex); - } - } - } - } - - private async Task ProcessNextFrameAsync() - { - // First read frame header - var frameHeaderBuffer = await ReadExactLength(12); - if (frameHeaderBuffer == null) - { - return false; // Underlying stream was closed - } - - // Parse frame header, then read the frame body - long streamId = BitConverter.ToInt64(frameHeaderBuffer, 0); - int frameBodyLength = BitConverter.ToInt32(frameHeaderBuffer, 8); - if (frameBodyLength < 0 || frameBodyLength > MaxFrameBodyLength) - { - throw new InvalidDataException("Illegal frame length: " + frameBodyLength); - } - - var frameBody = await ReadExactLength(frameBodyLength); - if (frameBody == null) - { - return false; // Underlying stream was closed - } - - // Dispatch the frame to the relevant inner stream - VirtualConnection innerStream; - lock (_activeInnerStreams) - { - _activeInnerStreams.TryGetValue(streamId, out innerStream); - } - - if (innerStream != null) - { - await innerStream.AddDataToQueue(frameBody); - } - - return true; - } - - private async Task ReadExactLength(int lengthToRead) { - byte[] buffer = new byte[lengthToRead]; - var totalBytesRead = 0; - var ct = _disposalCancellatonToken.Token; - while (totalBytesRead < lengthToRead) - { - var chunkLengthRead = await _underlyingTransport.ReadAsync(buffer, totalBytesRead, lengthToRead - totalBytesRead, ct); - if (chunkLengthRead == 0) - { - // Underlying stream was closed - return null; - } - - totalBytesRead += chunkLengthRead; - } - - return buffer; - } - - private void CloseAllActiveStreams() - { - IList innerStreamsCopy; - - // Only hold the lock while cloning the list of inner streams. Release the lock before - // actually disposing them, because each 'dispose' call will try to take another lock - // so it can remove that inner stream from activeInnerStreams. - lock (_activeInnerStreams) - { - innerStreamsCopy = _activeInnerStreams.Values.ToList(); - } - - foreach (var stream in innerStreamsCopy) - { - stream.Dispose(); - } - } - - public void Dispose() - { - if (!_disposedValue) - { - _disposedValue = true; - - _disposalCancellatonToken.Cancel(); // Stops the read loop - CloseAllActiveStreams(); - } - } - - public async Task WriteAsync(long innerStreamId, byte[] data, int offset, int count, CancellationToken cancellationToken) - { - // In case the amount of data to be sent exceeds the max frame length, split it into separate frames - // Note that we always send at least one frame, even if it's empty, because the zero-length frame is the signal to close a virtual connection - // (hence 'do..while' instead of just 'while'). - int bytesWritten = 0; - do { - // Improve discoverability of read-loop errors (in case the developer doesn't add an OnError listener) - ThrowIfReadLoopFailed(); - - // Hold the write lock only for the time taken to send a single frame, not all frames, to allow large sends to be proceed in parallel - await _streamWriterSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false); - try - { - // Write stream ID, then length prefix, then chunk payload, then flush - var nextChunkBodyLength = Math.Min(MaxFrameBodyLength, count - bytesWritten); - await _underlyingTransport.WriteAsync(BitConverter.GetBytes(innerStreamId), 0, 8, cancellationToken).ConfigureAwait(false); - await _underlyingTransport.WriteAsync(BitConverter.GetBytes(nextChunkBodyLength), 0, 4, cancellationToken).ConfigureAwait(false); - - if (nextChunkBodyLength > 0) - { - await _underlyingTransport.WriteAsync(data, offset + bytesWritten, nextChunkBodyLength, cancellationToken).ConfigureAwait(false); - bytesWritten += nextChunkBodyLength; - } - - await _underlyingTransport.FlushAsync(cancellationToken).ConfigureAwait(false); - } - finally - { - _streamWriterSemaphore.Release(); - } - } while (bytesWritten < count); - } - - public void CloseInnerStream(long innerStreamId, bool isAlreadyClosedRemotely) - { - lock (_activeInnerStreams) - { - if (_activeInnerStreams.ContainsKey(innerStreamId)) - { - _activeInnerStreams.Remove(innerStreamId); - } - } - - if (!isAlreadyClosedRemotely) { - // Also notify the remote that this innerstream is closed - WriteAsync(innerStreamId, new byte[0], 0, 0, new CancellationToken()).Wait(); - } - } - - private void ThrowIfReadLoopFailed() - { - if (_readLoopExitedWithException != null) - { - throw new AggregateException("The connection failed - see InnerException for details.", _readLoopExitedWithException); - } - } - } -} \ No newline at end of file diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/baseline.netcore.json b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/baseline.netcore.json deleted file mode 100644 index ad4020174e..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/baseline.netcore.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "AssemblyIdentity": "Microsoft.AspNetCore.NodeServices.Sockets, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "Microsoft.AspNetCore.NodeServices.Sockets.NodeServicesOptionsExtensions", - "Visibility": "Public", - "Kind": "Class", - "Abstract": true, - "Static": true, - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "UseSocketHosting", - "Parameters": [ - { - "Name": "options", - "Type": "Microsoft.AspNetCore.NodeServices.NodeServicesOptions" - } - ], - "ReturnType": "System.Void", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections.VirtualConnectionReadErrorHandler", - "Visibility": "Public", - "Kind": "Class", - "Sealed": true, - "BaseType": "System.MulticastDelegate", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "Invoke", - "Parameters": [ - { - "Name": "ex", - "Type": "System.Exception" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "BeginInvoke", - "Parameters": [ - { - "Name": "ex", - "Type": "System.Exception" - }, - { - "Name": "callback", - "Type": "System.AsyncCallback" - }, - { - "Name": "object", - "Type": "System.Object" - } - ], - "ReturnType": "System.IAsyncResult", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "EndInvoke", - "Parameters": [ - { - "Name": "result", - "Type": "System.IAsyncResult" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "object", - "Type": "System.Object" - }, - { - "Name": "method", - "Type": "System.IntPtr" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/package.json b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/package.json deleted file mode 100644 index 5f8648cc12..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "nodeservices.sockets", - "version": "1.0.0", - "description": "This is not really an NPM package and will not be published. This file exists only to reference compilation tools.", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "build": "./node_modules/.bin/webpack" - }, - "author": "Microsoft", - "license": "Apache-2.0", - "devDependencies": { - "@types/node": "^6.0.42", - "ts-loader": "^0.8.2", - "typescript": "^2.0.0", - "webpack": "^1.13.1" - } -} diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/webpack.config.js b/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/webpack.config.js deleted file mode 100644 index c11ba647d3..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices.Sockets/webpack.config.js +++ /dev/null @@ -1,20 +0,0 @@ -module.exports = { - target: 'node', - externals: ['fs', 'net', 'events', 'readline', 'stream'], - resolve: { - extensions: [ '.ts' ] - }, - module: { - loaders: [ - { test: /\.ts$/, loader: 'ts-loader' }, - ] - }, - entry: { - 'entrypoint-socket': ['./TypeScript/SocketNodeInstanceEntryPoint'], - }, - output: { - libraryTarget: 'commonjs', - path: './Content/Node', - filename: '[name].js' - } -}; diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj b/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj deleted file mode 100644 index 4472217f8f..0000000000 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - Helpers for building single-page applications on ASP.NET MVC Core. - netstandard2.0 - - - - - - - - - - - - - diff --git a/src/JavaScriptServices/templates/WhereHaveTheTemplatesGone.md b/src/JavaScriptServices/templates/WhereHaveTheTemplatesGone.md deleted file mode 100644 index 939f5cfe0b..0000000000 --- a/src/JavaScriptServices/templates/WhereHaveTheTemplatesGone.md +++ /dev/null @@ -1,11 +0,0 @@ -# Where have all the SPA templates gone? - -They are now in the [ASP.NET templating](https://github.com/aspnet/templating) repo. - -This is so that all the ASP.NET templates (both SPA and non-SPA) can be built, tested, and packaged from a single location and always included automatically in future SDK builds. - -### What about issues and pull requests? - -If you have issues or comments about the SPA templates, please continue to post them [here in this repo](https://github.com/aspnet/JavaScriptServices/issues), because then you will reach a more relevant group of contributors than if you posted to `aspnet/templating`. - -If you want to submit a pull request on the SPA templates, then of course you will neeed to submit that to the `aspnet/templating` repo, because that's where the code is now. But before doing so it's always a good idea to [post an issue on this repo](https://github.com/aspnet/JavaScriptServices/issues) describing what you want to do, so we can discuss whether or not such a PR would be accepted. diff --git a/src/JavaScriptServices/version.props b/src/JavaScriptServices/version.props deleted file mode 100644 index 669c874829..0000000000 --- a/src/JavaScriptServices/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 2.1.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/README.md b/src/Middleware/NodeServices/README.md similarity index 85% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/README.md rename to src/Middleware/NodeServices/README.md index c314db36d0..8f9b072899 100644 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/README.md +++ b/src/Middleware/NodeServices/README.md @@ -9,8 +9,7 @@ This NuGet package provides a fast and robust way to invoke Node.js code from a It is the underlying mechanism supporting the following packages: - * [`Microsoft.AspNetCore.SpaServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices) - builds on NodeServices, adding functionality commonly used in Single Page Applications, such as server-side prerendering, webpack middleware, and integration between server-side and client-side routing. - * [`Microsoft.AspNetCore.AngularServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.AngularServices) and [`Microsoft.AspNetCore.ReactServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.ReactServices) - these build on `SpaServices`, adding helpers specific to Angular and React, such as cache priming and integrating server-side and client-side validation + * [`Microsoft.AspNetCore.SpaServices`](/src/Middleware/SpaServices/) - builds on NodeServices, adding functionality commonly used in Single Page Applications, such as server-side prerendering, webpack middleware, and integration between server-side and client-side routing. ### Requirements @@ -37,7 +36,7 @@ For .NET Framework apps: In that case, you don't need to use NodeServices directly (or install it manually). You can either: * **Recommended:** Use the `aspnetcore-spa` Yeoman generator to get a ready-to-go starting point using your choice of client-side framework. [Instructions here.](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/) -* Or set up your ASP.NET Core and client-side Angular/React/KO/etc. app manually, and then use the [`Microsoft.AspNetCore.SpaServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices) package to add features like server-side prerendering or Webpack middleware. But really, at least try using the `aspnetcore-spa` generator first. +* Or set up your ASP.NET Core and client-side Angular/React/KO/etc. app manually, and then use the [`Microsoft.AspNetCore.SpaServices`](/src/Middleware/SpaServices/) package to add features like server-side prerendering or Webpack middleware. But really, at least try using the `aspnetcore-spa` generator first. # Simple usage example @@ -256,8 +255,6 @@ module.exports = function(result, physicalPath, maxWidth, maxHeight) { } ``` -There's a working image resizing example following this approach [here](https://github.com/aspnet/JavaScriptServices/tree/dev/samples/misc/NodeServicesExamples) - see the [C# code](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/misc/NodeServicesExamples/Controllers/ResizeImage.cs) and the [JavaScript code](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/misc/NodeServicesExamples/Node/resizeImage.js). - **Parameters** * `moduleName` - type: `string` @@ -331,26 +328,6 @@ NodeServices is not meant to compete with Edge.js. Instead, NodeServices is an a People have asked about using [VroomJS](https://github.com/fogzot/vroomjs) as a hosting mechanism. We don't currently plan to implement that, because Vroom only supplies a V8 runtime environment, not a complete Node environment. The difference is that, with a true Node environment, *all* NPM modules and Node code will work exactly as expected, whereas in a Vroom environment, code will only work if it doesn't use any Node primitives, which rules out large portions of the NPM landscape. -### Built-in hosting models - -Normally, you can just use the default hosting model, and not worry about it. But if you have some special requirements, you can write your own hosting model, or reference a package that supplies one. - -For example, you could use the 'socket' hosting model. It performs RPC between .NET and Node.js using a fast, low-level binary channel rather than the default HTTP transport. To do this, first install the NuGet package `Microsoft.AspNetCore.NodeServices.Sockets`. Then, at the top of your `Startup.cs` file, add: - -```csharp -using Microsoft.AspNetCore.NodeServices.Sockets; -``` - -...then in your `Startup.cs` file's `ConfigureServices` method, you can configure: - -```csharp -services.AddNodeServices(options => { - options.UseSocketHosting(); -}); -``` - -Now when you run your application, it will use the socket-based hosting and transport mechanism. In the past, the socket transport was faster than HTTP, but since .NET Core 1.1 improved the performance of `HttpClient` there isn't really any speed difference any more, so there's no longer any significant advantage to using `Microsoft.AspNetCore.NodeServices.Sockets`. - ### Custom hosting models If you implement a custom hosting model (by implementing `INodeInstance`), then you can cause it to be used by populating `NodeInstanceFactory` on your options: diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/.gitignore b/src/Middleware/NodeServices/samples/NodeServicesExamples/.gitignore similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/.gitignore rename to src/Middleware/NodeServices/samples/NodeServicesExamples/.gitignore diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Controllers/HomeController.cs b/src/Middleware/NodeServices/samples/NodeServicesExamples/Controllers/HomeController.cs similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Controllers/HomeController.cs rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Controllers/HomeController.cs diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Node/prerenderPage.js b/src/Middleware/NodeServices/samples/NodeServicesExamples/Node/prerenderPage.js similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Node/prerenderPage.js rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Node/prerenderPage.js diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Node/renderChart.js b/src/Middleware/NodeServices/samples/NodeServicesExamples/Node/renderChart.js similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Node/renderChart.js rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Node/renderChart.js diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Node/transpilation.js b/src/Middleware/NodeServices/samples/NodeServicesExamples/Node/transpilation.js similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Node/transpilation.js rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Node/transpilation.js diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/NodeServicesExamples.csproj b/src/Middleware/NodeServices/samples/NodeServicesExamples/NodeServicesExamples.csproj new file mode 100644 index 0000000000..eb2baff323 --- /dev/null +++ b/src/Middleware/NodeServices/samples/NodeServicesExamples/NodeServicesExamples.csproj @@ -0,0 +1,24 @@ + + + + netcoreapp2.1;net461 + true + false + + + + + + + + + + + + + + + + + + diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Startup.cs b/src/Middleware/NodeServices/samples/NodeServicesExamples/Startup.cs similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Startup.cs rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Startup.cs diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Home/Chart.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Chart.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Home/Chart.cshtml rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Chart.cshtml diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Home/ES2015Transpilation.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/ES2015Transpilation.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Home/ES2015Transpilation.cshtml rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/ES2015Transpilation.cshtml diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Home/Index.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Index.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Home/Index.cshtml rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Index.cshtml diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Home/Prerendering.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Prerendering.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Home/Prerendering.cshtml rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Prerendering.cshtml diff --git a/src/JavaScriptServices/samples/misc/Webpack/Views/Shared/Error.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Shared/Error.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/Views/Shared/Error.cshtml rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Shared/Error.cshtml diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Shared/_Layout.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Shared/_Layout.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Shared/_Layout.cshtml rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Shared/_Layout.cshtml diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/_ViewImports.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewImports.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/_ViewImports.cshtml rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewImports.cshtml diff --git a/src/JavaScriptServices/samples/misc/Webpack/Views/_ViewStart.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewStart.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/Views/_ViewStart.cshtml rename to src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewStart.cshtml diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/appsettings.json b/src/Middleware/NodeServices/samples/NodeServicesExamples/appsettings.json similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/appsettings.json rename to src/Middleware/NodeServices/samples/NodeServicesExamples/appsettings.json diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/jsconfig.json b/src/Middleware/NodeServices/samples/NodeServicesExamples/jsconfig.json similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/jsconfig.json rename to src/Middleware/NodeServices/samples/NodeServicesExamples/jsconfig.json diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/package.json b/src/Middleware/NodeServices/samples/NodeServicesExamples/package.json similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/package.json rename to src/Middleware/NodeServices/samples/NodeServicesExamples/package.json diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/wwwroot/css/chartist.min.css b/src/Middleware/NodeServices/samples/NodeServicesExamples/wwwroot/css/chartist.min.css similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/wwwroot/css/chartist.min.css rename to src/Middleware/NodeServices/samples/NodeServicesExamples/wwwroot/css/chartist.min.css diff --git a/src/JavaScriptServices/samples/misc/Webpack/wwwroot/favicon.ico b/src/Middleware/NodeServices/samples/NodeServicesExamples/wwwroot/favicon.ico similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/wwwroot/favicon.ico rename to src/Middleware/NodeServices/samples/NodeServicesExamples/wwwroot/favicon.ico diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/wwwroot/js/main.js b/src/Middleware/NodeServices/samples/NodeServicesExamples/wwwroot/js/main.js similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/wwwroot/js/main.js rename to src/Middleware/NodeServices/samples/NodeServicesExamples/wwwroot/js/main.js diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/wwwroot/web.config b/src/Middleware/NodeServices/samples/NodeServicesExamples/wwwroot/web.config similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/wwwroot/web.config rename to src/Middleware/NodeServices/samples/NodeServicesExamples/wwwroot/web.config diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/.gitignore b/src/Middleware/NodeServices/src/.gitignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/.gitignore rename to src/Middleware/NodeServices/src/.gitignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesFactory.cs b/src/Middleware/NodeServices/src/Configuration/NodeServicesFactory.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesFactory.cs rename to src/Middleware/NodeServices/src/Configuration/NodeServicesFactory.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs b/src/Middleware/NodeServices/src/Configuration/NodeServicesOptions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs rename to src/Middleware/NodeServices/src/Configuration/NodeServicesOptions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesServiceCollectionExtensions.cs b/src/Middleware/NodeServices/src/Configuration/NodeServicesServiceCollectionExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesServiceCollectionExtensions.cs rename to src/Middleware/NodeServices/src/Configuration/NodeServicesServiceCollectionExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js b/src/Middleware/NodeServices/src/Content/Node/entrypoint-http.js similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js rename to src/Middleware/NodeServices/src/Content/Node/entrypoint-http.js diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs b/src/Middleware/NodeServices/src/HostingModels/HttpNodeInstance.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs rename to src/Middleware/NodeServices/src/HostingModels/HttpNodeInstance.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/INodeInstance.cs b/src/Middleware/NodeServices/src/HostingModels/INodeInstance.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/INodeInstance.cs rename to src/Middleware/NodeServices/src/HostingModels/INodeInstance.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationException.cs b/src/Middleware/NodeServices/src/HostingModels/NodeInvocationException.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationException.cs rename to src/Middleware/NodeServices/src/HostingModels/NodeInvocationException.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationInfo.cs b/src/Middleware/NodeServices/src/HostingModels/NodeInvocationInfo.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationInfo.cs rename to src/Middleware/NodeServices/src/HostingModels/NodeInvocationInfo.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeServicesOptionsExtensions.cs b/src/Middleware/NodeServices/src/HostingModels/NodeServicesOptionsExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeServicesOptionsExtensions.cs rename to src/Middleware/NodeServices/src/HostingModels/NodeServicesOptionsExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Middleware/NodeServices/src/HostingModels/OutOfProcessNodeInstance.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs rename to src/Middleware/NodeServices/src/HostingModels/OutOfProcessNodeInstance.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/INodeServices.cs b/src/Middleware/NodeServices/src/INodeServices.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/INodeServices.cs rename to src/Middleware/NodeServices/src/INodeServices.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj similarity index 62% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj rename to src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj index 6d64797f2f..a1c92f2fe8 100644 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/NodeServicesImpl.cs b/src/Middleware/NodeServices/src/NodeServicesImpl.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/NodeServicesImpl.cs rename to src/Middleware/NodeServices/src/NodeServicesImpl.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts b/src/Middleware/NodeServices/src/TypeScript/HttpNodeInstanceEntryPoint.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts rename to src/Middleware/NodeServices/src/TypeScript/HttpNodeInstanceEntryPoint.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/ArgsUtil.ts b/src/Middleware/NodeServices/src/TypeScript/Util/ArgsUtil.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/ArgsUtil.ts rename to src/Middleware/NodeServices/src/TypeScript/Util/ArgsUtil.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/ExitWhenParentExits.ts b/src/Middleware/NodeServices/src/TypeScript/Util/ExitWhenParentExits.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/ExitWhenParentExits.ts rename to src/Middleware/NodeServices/src/TypeScript/Util/ExitWhenParentExits.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/OverrideStdOutputs.ts b/src/Middleware/NodeServices/src/TypeScript/Util/OverrideStdOutputs.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/OverrideStdOutputs.ts rename to src/Middleware/NodeServices/src/TypeScript/Util/OverrideStdOutputs.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts b/src/Middleware/NodeServices/src/TypeScript/Util/PatchModuleResolutionLStat.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts rename to src/Middleware/NodeServices/src/TypeScript/Util/PatchModuleResolutionLStat.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/tsconfig.json b/src/Middleware/NodeServices/src/TypeScript/tsconfig.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/TypeScript/tsconfig.json rename to src/Middleware/NodeServices/src/TypeScript/tsconfig.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Util/EmbeddedResourceReader.cs b/src/Middleware/NodeServices/src/Util/EmbeddedResourceReader.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Util/EmbeddedResourceReader.cs rename to src/Middleware/NodeServices/src/Util/EmbeddedResourceReader.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs b/src/Middleware/NodeServices/src/Util/StringAsTempFile.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs rename to src/Middleware/NodeServices/src/Util/StringAsTempFile.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Util/TaskExtensions.cs b/src/Middleware/NodeServices/src/Util/TaskExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/Util/TaskExtensions.cs rename to src/Middleware/NodeServices/src/Util/TaskExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/baseline.netcore.json b/src/Middleware/NodeServices/src/baseline.netcore.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/baseline.netcore.json rename to src/Middleware/NodeServices/src/baseline.netcore.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/package.json b/src/Middleware/NodeServices/src/package.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/package.json rename to src/Middleware/NodeServices/src/package.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/webpack.config.js b/src/Middleware/NodeServices/src/webpack.config.js similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.NodeServices/webpack.config.js rename to src/Middleware/NodeServices/src/webpack.config.js diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliBuilder.cs b/src/Middleware/SpaServices.Extensions/src/AngularCli/AngularCliBuilder.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliBuilder.cs rename to src/Middleware/SpaServices.Extensions/src/AngularCli/AngularCliBuilder.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliMiddleware.cs b/src/Middleware/SpaServices.Extensions/src/AngularCli/AngularCliMiddleware.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliMiddleware.cs rename to src/Middleware/SpaServices.Extensions/src/AngularCli/AngularCliMiddleware.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliMiddlewareExtensions.cs b/src/Middleware/SpaServices.Extensions/src/AngularCli/AngularCliMiddlewareExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliMiddlewareExtensions.cs rename to src/Middleware/SpaServices.Extensions/src/AngularCli/AngularCliMiddlewareExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/DefaultSpaBuilder.cs b/src/Middleware/SpaServices.Extensions/src/DefaultSpaBuilder.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/DefaultSpaBuilder.cs rename to src/Middleware/SpaServices.Extensions/src/DefaultSpaBuilder.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/ISpaBuilder.cs b/src/Middleware/SpaServices.Extensions/src/ISpaBuilder.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/ISpaBuilder.cs rename to src/Middleware/SpaServices.Extensions/src/ISpaBuilder.cs diff --git a/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj b/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj new file mode 100644 index 0000000000..0af7e28727 --- /dev/null +++ b/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj @@ -0,0 +1,18 @@ + + + + Helpers for building single-page applications on ASP.NET MVC Core. + netstandard2.0 + + + + + + + + + + + + + diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Npm/NpmScriptRunner.cs b/src/Middleware/SpaServices.Extensions/src/Npm/NpmScriptRunner.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Npm/NpmScriptRunner.cs rename to src/Middleware/SpaServices.Extensions/src/Npm/NpmScriptRunner.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/ISpaPrerendererBuilder.cs b/src/Middleware/SpaServices.Extensions/src/Prerendering/ISpaPrerendererBuilder.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/ISpaPrerendererBuilder.cs rename to src/Middleware/SpaServices.Extensions/src/Prerendering/ISpaPrerendererBuilder.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingExtensions.cs b/src/Middleware/SpaServices.Extensions/src/Prerendering/SpaPrerenderingExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingExtensions.cs rename to src/Middleware/SpaServices.Extensions/src/Prerendering/SpaPrerenderingExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingOptions.cs b/src/Middleware/SpaServices.Extensions/src/Prerendering/SpaPrerenderingOptions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingOptions.cs rename to src/Middleware/SpaServices.Extensions/src/Prerendering/SpaPrerenderingOptions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/ConditionalProxyMiddleware.cs b/src/Middleware/SpaServices.Extensions/src/Proxying/ConditionalProxyMiddleware.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/ConditionalProxyMiddleware.cs rename to src/Middleware/SpaServices.Extensions/src/Proxying/ConditionalProxyMiddleware.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/SpaProxy.cs b/src/Middleware/SpaServices.Extensions/src/Proxying/SpaProxy.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/SpaProxy.cs rename to src/Middleware/SpaServices.Extensions/src/Proxying/SpaProxy.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/SpaProxyingExtensions.cs b/src/Middleware/SpaServices.Extensions/src/Proxying/SpaProxyingExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/SpaProxyingExtensions.cs rename to src/Middleware/SpaServices.Extensions/src/Proxying/SpaProxyingExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs b/src/Middleware/SpaServices.Extensions/src/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs rename to src/Middleware/SpaServices.Extensions/src/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddlewareExtensions.cs b/src/Middleware/SpaServices.Extensions/src/ReactDevelopmentServer/ReactDevelopmentServerMiddlewareExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddlewareExtensions.cs rename to src/Middleware/SpaServices.Extensions/src/ReactDevelopmentServer/ReactDevelopmentServerMiddlewareExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaApplicationBuilderExtensions.cs b/src/Middleware/SpaServices.Extensions/src/SpaApplicationBuilderExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaApplicationBuilderExtensions.cs rename to src/Middleware/SpaServices.Extensions/src/SpaApplicationBuilderExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaDefaultPageMiddleware.cs b/src/Middleware/SpaServices.Extensions/src/SpaDefaultPageMiddleware.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaDefaultPageMiddleware.cs rename to src/Middleware/SpaServices.Extensions/src/SpaDefaultPageMiddleware.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaOptions.cs b/src/Middleware/SpaServices.Extensions/src/SpaOptions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaOptions.cs rename to src/Middleware/SpaServices.Extensions/src/SpaOptions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/DefaultSpaStaticFileProvider.cs b/src/Middleware/SpaServices.Extensions/src/StaticFiles/DefaultSpaStaticFileProvider.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/DefaultSpaStaticFileProvider.cs rename to src/Middleware/SpaServices.Extensions/src/StaticFiles/DefaultSpaStaticFileProvider.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/ISpaStaticFileProvider.cs b/src/Middleware/SpaServices.Extensions/src/StaticFiles/ISpaStaticFileProvider.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/ISpaStaticFileProvider.cs rename to src/Middleware/SpaServices.Extensions/src/StaticFiles/ISpaStaticFileProvider.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/SpaStaticFilesExtensions.cs b/src/Middleware/SpaServices.Extensions/src/StaticFiles/SpaStaticFilesExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/SpaStaticFilesExtensions.cs rename to src/Middleware/SpaServices.Extensions/src/StaticFiles/SpaStaticFilesExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/SpaStaticFilesOptions.cs b/src/Middleware/SpaServices.Extensions/src/StaticFiles/SpaStaticFilesOptions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/SpaStaticFilesOptions.cs rename to src/Middleware/SpaServices.Extensions/src/StaticFiles/SpaStaticFilesOptions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/EventedStreamReader.cs b/src/Middleware/SpaServices.Extensions/src/Util/EventedStreamReader.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/EventedStreamReader.cs rename to src/Middleware/SpaServices.Extensions/src/Util/EventedStreamReader.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/EventedStreamStringReader.cs b/src/Middleware/SpaServices.Extensions/src/Util/EventedStreamStringReader.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/EventedStreamStringReader.cs rename to src/Middleware/SpaServices.Extensions/src/Util/EventedStreamStringReader.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/LoggerFinder.cs b/src/Middleware/SpaServices.Extensions/src/Util/LoggerFinder.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/LoggerFinder.cs rename to src/Middleware/SpaServices.Extensions/src/Util/LoggerFinder.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/TaskTimeoutExtensions.cs b/src/Middleware/SpaServices.Extensions/src/Util/TaskTimeoutExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/TaskTimeoutExtensions.cs rename to src/Middleware/SpaServices.Extensions/src/Util/TaskTimeoutExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/TcpPortFinder.cs b/src/Middleware/SpaServices.Extensions/src/Util/TcpPortFinder.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/TcpPortFinder.cs rename to src/Middleware/SpaServices.Extensions/src/Util/TcpPortFinder.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/baseline.netcore.json b/src/Middleware/SpaServices.Extensions/src/baseline.netcore.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices.Extensions/baseline.netcore.json rename to src/Middleware/SpaServices.Extensions/src/baseline.netcore.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/README.md b/src/Middleware/SpaServices/README.md similarity index 98% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/README.md rename to src/Middleware/SpaServices/README.md index e7622a4355..3102b55269 100644 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/README.md +++ b/src/Middleware/SpaServices/README.md @@ -9,7 +9,7 @@ This package enables: * [**Hot module replacement**](#webpack-hot-module-replacement) so that, during development, your code and markup changes will be pushed to your browser and updated in the running application automatically, without even needing to reload the page * [**Routing helpers**](#routing-helper-mapspafallbackroute) for integrating server-side routing with client-side routing -Behind the scenes, it uses the [`Microsoft.AspNetCore.NodeServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.NodeServices) package as a fast and robust way to invoke Node.js-hosted code from ASP.NET Core at runtime. +Behind the scenes, it uses the [`Microsoft.AspNetCore.NodeServices`](src/Middleware/NodeServices) package as a fast and robust way to invoke Node.js-hosted code from ASP.NET Core at runtime. ### Requirements @@ -223,8 +223,6 @@ npm install --save angular2-universal Now you can use the [`angular2-universal` APIs](https://github.com/angular/universal) from your `boot-server.ts` TypeScript module to execute your Angular component on the server. The code needed for this is fairly complex, but that's unavoidable because Angular supports so many different ways of being configured, and you need to provide wiring for whatever combination of DI modules you're using. -You can find an example `boot-server.ts` that renders arbitrary Angular components [here](https://github.com/aspnet/JavaScriptServices/blob/dev/templates/AngularSpa/ClientApp/boot-server.ts). If you use this with your own application, you might need to edit the `serverBindings` array to reference any other DI services that your Angular component depends on. - The easiest way to get started with Angular server-side rendering on ASP.NET Core is to use the [aspnetcore-spa generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/), which creates a ready-made working starting point. ### 5(b). Prerendering React components @@ -299,8 +297,6 @@ If you want to enable server-side prerendering too, follow the same process as d The above example is extremely simple - it doesn't use `react-router`, and it doesn't load any data asynchronously. Real applications are likely to do both of these. -For an example server-side boot module that knows how to evaluate `react-router` routes and render the correct React component, see [this example](https://github.com/aspnet/JavaScriptServices/blob/dev/templates/ReactReduxSpa/ClientApp/boot-server.tsx). - Supporting asynchronous data loading involves more considerations. Unlike Angular applications that run asynchronously on the server and freely overwrite server-generated markup with client-generated markup, React strictly wants to run synchronously on the server and always produce the same markup on the server as it does on the client. To make this work, you most likely need some way to know in advance what data your React components will need to use, load it separately from those components, and have some way of transferring information about the loaded data from server to client. If you try to implement this in a generalized way, you'll end up reinventing something like the Flux/Redux pattern. @@ -327,7 +323,7 @@ As a simple example, here's how you can set up Webpack to build TypeScript files ``` npm install --save typescript ts-loader -``` +``` And if you don't already have it, you'll find it useful to install the `webpack` command-line tool: @@ -641,8 +637,8 @@ by using the `HotModuleReplacementClientOptions` property on `WebpackDevMiddlewa ```csharp app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { HotModuleReplacement = true, - HotModuleReplacementClientOptions = new Dictionary { - { "reload", "true" }, + HotModuleReplacementClientOptions = new Dictionary { + { "reload", "true" }, }, }); ``` diff --git a/src/JavaScriptServices/samples/misc/Webpack/.gitignore b/src/Middleware/SpaServices/samples/Webpack/.gitignore similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/.gitignore rename to src/Middleware/SpaServices/samples/Webpack/.gitignore diff --git a/src/JavaScriptServices/samples/misc/Webpack/ActionResults/PrerenderResult.cs b/src/Middleware/SpaServices/samples/Webpack/ActionResults/PrerenderResult.cs similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/ActionResults/PrerenderResult.cs rename to src/Middleware/SpaServices/samples/Webpack/ActionResults/PrerenderResult.cs diff --git a/src/JavaScriptServices/samples/misc/Webpack/ActionResults/PrerenderResultExtensions.cs b/src/Middleware/SpaServices/samples/Webpack/ActionResults/PrerenderResultExtensions.cs similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/ActionResults/PrerenderResultExtensions.cs rename to src/Middleware/SpaServices/samples/Webpack/ActionResults/PrerenderResultExtensions.cs diff --git a/src/JavaScriptServices/samples/misc/Webpack/Clientside/App.ts b/src/Middleware/SpaServices/samples/Webpack/Clientside/App.ts similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/Clientside/App.ts rename to src/Middleware/SpaServices/samples/Webpack/Clientside/App.ts diff --git a/src/JavaScriptServices/samples/misc/Webpack/Clientside/HelloWorld.ts b/src/Middleware/SpaServices/samples/Webpack/Clientside/HelloWorld.ts similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/Clientside/HelloWorld.ts rename to src/Middleware/SpaServices/samples/Webpack/Clientside/HelloWorld.ts diff --git a/src/JavaScriptServices/samples/misc/Webpack/Clientside/styles/main.less b/src/Middleware/SpaServices/samples/Webpack/Clientside/styles/main.less similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/Clientside/styles/main.less rename to src/Middleware/SpaServices/samples/Webpack/Clientside/styles/main.less diff --git a/src/JavaScriptServices/samples/misc/Webpack/Controllers/HomeController.cs b/src/Middleware/SpaServices/samples/Webpack/Controllers/HomeController.cs similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/Controllers/HomeController.cs rename to src/Middleware/SpaServices/samples/Webpack/Controllers/HomeController.cs diff --git a/src/JavaScriptServices/samples/misc/Webpack/Startup.cs b/src/Middleware/SpaServices/samples/Webpack/Startup.cs similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/Startup.cs rename to src/Middleware/SpaServices/samples/Webpack/Startup.cs diff --git a/src/JavaScriptServices/samples/misc/Webpack/Views/Home/Index.cshtml b/src/Middleware/SpaServices/samples/Webpack/Views/Home/Index.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/Views/Home/Index.cshtml rename to src/Middleware/SpaServices/samples/Webpack/Views/Home/Index.cshtml diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Shared/Error.cshtml b/src/Middleware/SpaServices/samples/Webpack/Views/Shared/Error.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/Shared/Error.cshtml rename to src/Middleware/SpaServices/samples/Webpack/Views/Shared/Error.cshtml diff --git a/src/JavaScriptServices/samples/misc/Webpack/Views/Shared/_Layout.cshtml b/src/Middleware/SpaServices/samples/Webpack/Views/Shared/_Layout.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/Views/Shared/_Layout.cshtml rename to src/Middleware/SpaServices/samples/Webpack/Views/Shared/_Layout.cshtml diff --git a/src/JavaScriptServices/samples/misc/Webpack/Views/_ViewImports.cshtml b/src/Middleware/SpaServices/samples/Webpack/Views/_ViewImports.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/Views/_ViewImports.cshtml rename to src/Middleware/SpaServices/samples/Webpack/Views/_ViewImports.cshtml diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/_ViewStart.cshtml b/src/Middleware/SpaServices/samples/Webpack/Views/_ViewStart.cshtml similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/Views/_ViewStart.cshtml rename to src/Middleware/SpaServices/samples/Webpack/Views/_ViewStart.cshtml diff --git a/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj b/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj new file mode 100644 index 0000000000..691fc80912 --- /dev/null +++ b/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj @@ -0,0 +1,24 @@ + + + + netcoreapp2.1;net461 + true + false + + + + + + + + + + + + + + + + + + diff --git a/src/JavaScriptServices/samples/misc/Webpack/appsettings.json b/src/Middleware/SpaServices/samples/Webpack/appsettings.json similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/appsettings.json rename to src/Middleware/SpaServices/samples/Webpack/appsettings.json diff --git a/src/JavaScriptServices/samples/misc/Webpack/package.json b/src/Middleware/SpaServices/samples/Webpack/package.json similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/package.json rename to src/Middleware/SpaServices/samples/Webpack/package.json diff --git a/src/JavaScriptServices/samples/misc/Webpack/tsconfig.json b/src/Middleware/SpaServices/samples/Webpack/tsconfig.json similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/tsconfig.json rename to src/Middleware/SpaServices/samples/Webpack/tsconfig.json diff --git a/src/JavaScriptServices/samples/misc/Webpack/webpack.config.dev.js b/src/Middleware/SpaServices/samples/Webpack/webpack.config.dev.js similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/webpack.config.dev.js rename to src/Middleware/SpaServices/samples/Webpack/webpack.config.dev.js diff --git a/src/JavaScriptServices/samples/misc/Webpack/webpack.config.js b/src/Middleware/SpaServices/samples/Webpack/webpack.config.js similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/webpack.config.js rename to src/Middleware/SpaServices/samples/Webpack/webpack.config.js diff --git a/src/JavaScriptServices/samples/misc/Webpack/webpack.config.prod.js b/src/Middleware/SpaServices/samples/Webpack/webpack.config.prod.js similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/webpack.config.prod.js rename to src/Middleware/SpaServices/samples/Webpack/webpack.config.prod.js diff --git a/src/JavaScriptServices/samples/misc/NodeServicesExamples/wwwroot/favicon.ico b/src/Middleware/SpaServices/samples/Webpack/wwwroot/favicon.ico similarity index 100% rename from src/JavaScriptServices/samples/misc/NodeServicesExamples/wwwroot/favicon.ico rename to src/Middleware/SpaServices/samples/Webpack/wwwroot/favicon.ico diff --git a/src/JavaScriptServices/samples/misc/Webpack/wwwroot/web.config b/src/Middleware/SpaServices/samples/Webpack/wwwroot/web.config similarity index 100% rename from src/JavaScriptServices/samples/misc/Webpack/wwwroot/web.config rename to src/Middleware/SpaServices/samples/Webpack/wwwroot/web.config diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/.gitignore b/src/Middleware/SpaServices/src/.gitignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/.gitignore rename to src/Middleware/SpaServices/src/.gitignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Content/Node/prerenderer.js b/src/Middleware/SpaServices/src/Content/Node/prerenderer.js similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Content/Node/prerenderer.js rename to src/Middleware/SpaServices/src/Content/Node/prerenderer.js diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Content/Node/webpack-dev-middleware.js b/src/Middleware/SpaServices/src/Content/Node/webpack-dev-middleware.js similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Content/Node/webpack-dev-middleware.js rename to src/Middleware/SpaServices/src/Content/Node/webpack-dev-middleware.js diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj similarity index 63% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj rename to src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj index 15cf81290e..87abb1d2bb 100644 --- a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj @@ -11,12 +11,12 @@ - + - - + + diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/DefaultSpaPrerenderer.cs b/src/Middleware/SpaServices/src/Prerendering/DefaultSpaPrerenderer.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/DefaultSpaPrerenderer.cs rename to src/Middleware/SpaServices/src/Prerendering/DefaultSpaPrerenderer.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/ISpaPrerenderer.cs b/src/Middleware/SpaServices/src/Prerendering/ISpaPrerenderer.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/ISpaPrerenderer.cs rename to src/Middleware/SpaServices/src/Prerendering/ISpaPrerenderer.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/JavaScriptModuleExport.cs b/src/Middleware/SpaServices/src/Prerendering/JavaScriptModuleExport.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/JavaScriptModuleExport.cs rename to src/Middleware/SpaServices/src/Prerendering/JavaScriptModuleExport.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs b/src/Middleware/SpaServices/src/Prerendering/PrerenderTagHelper.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs rename to src/Middleware/SpaServices/src/Prerendering/PrerenderTagHelper.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs b/src/Middleware/SpaServices/src/Prerendering/Prerenderer.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs rename to src/Middleware/SpaServices/src/Prerendering/Prerenderer.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderingServiceCollectionExtensions.cs b/src/Middleware/SpaServices/src/Prerendering/PrerenderingServiceCollectionExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderingServiceCollectionExtensions.cs rename to src/Middleware/SpaServices/src/Prerendering/PrerenderingServiceCollectionExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs b/src/Middleware/SpaServices/src/Prerendering/RenderToStringResult.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs rename to src/Middleware/SpaServices/src/Prerendering/RenderToStringResult.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteConstraint.cs b/src/Middleware/SpaServices/src/Routing/SpaRouteConstraint.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteConstraint.cs rename to src/Middleware/SpaServices/src/Routing/SpaRouteConstraint.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteExtensions.cs b/src/Middleware/SpaServices/src/Routing/SpaRouteExtensions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteExtensions.cs rename to src/Middleware/SpaServices/src/Routing/SpaRouteExtensions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/TypeScript/Prerenderer.ts b/src/Middleware/SpaServices/src/TypeScript/Prerenderer.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/TypeScript/Prerenderer.ts rename to src/Middleware/SpaServices/src/TypeScript/Prerenderer.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/TypeScript/WebpackDevMiddleware.ts b/src/Middleware/SpaServices/src/TypeScript/WebpackDevMiddleware.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/TypeScript/WebpackDevMiddleware.ts rename to src/Middleware/SpaServices/src/TypeScript/WebpackDevMiddleware.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/TypeScript/tsconfig.json b/src/Middleware/SpaServices/src/TypeScript/tsconfig.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/TypeScript/tsconfig.json rename to src/Middleware/SpaServices/src/TypeScript/tsconfig.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs b/src/Middleware/SpaServices/src/Webpack/ConditionalProxyMiddleware.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs rename to src/Middleware/SpaServices/src/Webpack/ConditionalProxyMiddleware.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddlewareOptions.cs b/src/Middleware/SpaServices/src/Webpack/ConditionalProxyMiddlewareOptions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddlewareOptions.cs rename to src/Middleware/SpaServices/src/Webpack/ConditionalProxyMiddlewareOptions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs b/src/Middleware/SpaServices/src/Webpack/WebpackDevMiddleware.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs rename to src/Middleware/SpaServices/src/Webpack/WebpackDevMiddleware.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs b/src/Middleware/SpaServices/src/Webpack/WebpackDevMiddlewareOptions.cs similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs rename to src/Middleware/SpaServices/src/Webpack/WebpackDevMiddlewareOptions.cs diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/baseline.netcore.json b/src/Middleware/SpaServices/src/baseline.netcore.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/baseline.netcore.json rename to src/Middleware/SpaServices/src/baseline.netcore.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore b/src/Middleware/SpaServices/src/npm/aspnet-angular/.gitignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore rename to src/Middleware/SpaServices/src/npm/aspnet-angular/.gitignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore b/src/Middleware/SpaServices/src/npm/aspnet-angular/.npmignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore rename to src/Middleware/SpaServices/src/npm/aspnet-angular/.npmignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/LICENSE.txt b/src/Middleware/SpaServices/src/npm/aspnet-angular/LICENSE.txt similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/LICENSE.txt rename to src/Middleware/SpaServices/src/npm/aspnet-angular/LICENSE.txt diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json b/src/Middleware/SpaServices/src/npm/aspnet-angular/package.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json rename to src/Middleware/SpaServices/src/npm/aspnet-angular/package.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/HttpWithStateTransfer.ts b/src/Middleware/SpaServices/src/npm/aspnet-angular/src/HttpWithStateTransfer.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/HttpWithStateTransfer.ts rename to src/Middleware/SpaServices/src/npm/aspnet-angular/src/HttpWithStateTransfer.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/index.ts b/src/Middleware/SpaServices/src/npm/aspnet-angular/src/index.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/index.ts rename to src/Middleware/SpaServices/src/npm/aspnet-angular/src/index.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json b/src/Middleware/SpaServices/src/npm/aspnet-angular/tsconfig.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json rename to src/Middleware/SpaServices/src/npm/aspnet-angular/tsconfig.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/.gitignore b/src/Middleware/SpaServices/src/npm/aspnet-prerendering/.gitignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/.gitignore rename to src/Middleware/SpaServices/src/npm/aspnet-prerendering/.gitignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/.npmignore b/src/Middleware/SpaServices/src/npm/aspnet-prerendering/.npmignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/.npmignore rename to src/Middleware/SpaServices/src/npm/aspnet-prerendering/.npmignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/LICENSE.txt b/src/Middleware/SpaServices/src/npm/aspnet-prerendering/LICENSE.txt similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/LICENSE.txt rename to src/Middleware/SpaServices/src/npm/aspnet-prerendering/LICENSE.txt diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/README.md b/src/Middleware/SpaServices/src/npm/aspnet-prerendering/README.md similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/README.md rename to src/Middleware/SpaServices/src/npm/aspnet-prerendering/README.md diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json b/src/Middleware/SpaServices/src/npm/aspnet-prerendering/package.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json rename to src/Middleware/SpaServices/src/npm/aspnet-prerendering/package.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts b/src/Middleware/SpaServices/src/npm/aspnet-prerendering/src/Prerendering.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts rename to src/Middleware/SpaServices/src/npm/aspnet-prerendering/src/Prerendering.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts b/src/Middleware/SpaServices/src/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts rename to src/Middleware/SpaServices/src/npm/aspnet-prerendering/src/PrerenderingInterfaces.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts b/src/Middleware/SpaServices/src/npm/aspnet-prerendering/src/index.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts rename to src/Middleware/SpaServices/src/npm/aspnet-prerendering/src/index.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/tsconfig.json b/src/Middleware/SpaServices/src/npm/aspnet-prerendering/tsconfig.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/tsconfig.json rename to src/Middleware/SpaServices/src/npm/aspnet-prerendering/tsconfig.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/.gitignore b/src/Middleware/SpaServices/src/npm/aspnet-webpack-react/.gitignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/.gitignore rename to src/Middleware/SpaServices/src/npm/aspnet-webpack-react/.gitignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/.npmignore b/src/Middleware/SpaServices/src/npm/aspnet-webpack-react/.npmignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/.npmignore rename to src/Middleware/SpaServices/src/npm/aspnet-webpack-react/.npmignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/LICENSE.txt b/src/Middleware/SpaServices/src/npm/aspnet-webpack-react/LICENSE.txt similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/LICENSE.txt rename to src/Middleware/SpaServices/src/npm/aspnet-webpack-react/LICENSE.txt diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/README.md b/src/Middleware/SpaServices/src/npm/aspnet-webpack-react/README.md similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/README.md rename to src/Middleware/SpaServices/src/npm/aspnet-webpack-react/README.md diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json b/src/Middleware/SpaServices/src/npm/aspnet-webpack-react/package.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json rename to src/Middleware/SpaServices/src/npm/aspnet-webpack-react/package.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts b/src/Middleware/SpaServices/src/npm/aspnet-webpack-react/src/HotModuleReplacement.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts rename to src/Middleware/SpaServices/src/npm/aspnet-webpack-react/src/HotModuleReplacement.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts b/src/Middleware/SpaServices/src/npm/aspnet-webpack-react/src/index.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/index.ts rename to src/Middleware/SpaServices/src/npm/aspnet-webpack-react/src/index.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json b/src/Middleware/SpaServices/src/npm/aspnet-webpack-react/tsconfig.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/tsconfig.json rename to src/Middleware/SpaServices/src/npm/aspnet-webpack-react/tsconfig.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/.gitignore b/src/Middleware/SpaServices/src/npm/aspnet-webpack/.gitignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/.gitignore rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/.gitignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/.npmignore b/src/Middleware/SpaServices/src/npm/aspnet-webpack/.npmignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/.npmignore rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/.npmignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/LICENSE.txt b/src/Middleware/SpaServices/src/npm/aspnet-webpack/LICENSE.txt similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/LICENSE.txt rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/LICENSE.txt diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/README.md b/src/Middleware/SpaServices/src/npm/aspnet-webpack/README.md similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/README.md rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/README.md diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package-lock.json b/src/Middleware/SpaServices/src/npm/aspnet-webpack/package-lock.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package-lock.json rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/package-lock.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json b/src/Middleware/SpaServices/src/npm/aspnet-webpack/package.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/package.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts b/src/Middleware/SpaServices/src/npm/aspnet-webpack/src/LoadViaWebpack.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/src/LoadViaWebpack.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/RequireNewCopy.ts b/src/Middleware/SpaServices/src/npm/aspnet-webpack/src/RequireNewCopy.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/RequireNewCopy.ts rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/src/RequireNewCopy.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Middleware/SpaServices/src/npm/aspnet-webpack/src/WebpackDevMiddleware.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/src/WebpackDevMiddleware.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackTestPermissions.ts b/src/Middleware/SpaServices/src/npm/aspnet-webpack/src/WebpackTestPermissions.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackTestPermissions.ts rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/src/WebpackTestPermissions.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/index.ts b/src/Middleware/SpaServices/src/npm/aspnet-webpack/src/index.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/index.ts rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/src/index.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/typings/memory-fs.d.ts b/src/Middleware/SpaServices/src/npm/aspnet-webpack/src/typings/memory-fs.d.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/typings/memory-fs.d.ts rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/src/typings/memory-fs.d.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/typings/require-from-string.d.ts b/src/Middleware/SpaServices/src/npm/aspnet-webpack/src/typings/require-from-string.d.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/typings/require-from-string.d.ts rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/src/typings/require-from-string.d.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/typings/webpack-node-externals.d.ts b/src/Middleware/SpaServices/src/npm/aspnet-webpack/src/typings/webpack-node-externals.d.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/typings/webpack-node-externals.d.ts rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/src/typings/webpack-node-externals.d.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/tsconfig.json b/src/Middleware/SpaServices/src/npm/aspnet-webpack/tsconfig.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/tsconfig.json rename to src/Middleware/SpaServices/src/npm/aspnet-webpack/tsconfig.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/.gitignore b/src/Middleware/SpaServices/src/npm/domain-task/.gitignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/.gitignore rename to src/Middleware/SpaServices/src/npm/domain-task/.gitignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/.npmignore b/src/Middleware/SpaServices/src/npm/domain-task/.npmignore similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/.npmignore rename to src/Middleware/SpaServices/src/npm/domain-task/.npmignore diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/LICENSE.txt b/src/Middleware/SpaServices/src/npm/domain-task/LICENSE.txt similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/LICENSE.txt rename to src/Middleware/SpaServices/src/npm/domain-task/LICENSE.txt diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/README.md b/src/Middleware/SpaServices/src/npm/domain-task/README.md similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/README.md rename to src/Middleware/SpaServices/src/npm/domain-task/README.md diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json b/src/Middleware/SpaServices/src/npm/domain-task/package.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json rename to src/Middleware/SpaServices/src/npm/domain-task/package.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/domain-context.d.ts b/src/Middleware/SpaServices/src/npm/domain-task/src/domain-context.d.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/domain-context.d.ts rename to src/Middleware/SpaServices/src/npm/domain-task/src/domain-context.d.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts b/src/Middleware/SpaServices/src/npm/domain-task/src/fetch.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts rename to src/Middleware/SpaServices/src/npm/domain-task/src/fetch.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/index.ts b/src/Middleware/SpaServices/src/npm/domain-task/src/index.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/index.ts rename to src/Middleware/SpaServices/src/npm/domain-task/src/index.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/main.ts b/src/Middleware/SpaServices/src/npm/domain-task/src/main.ts similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/main.ts rename to src/Middleware/SpaServices/src/npm/domain-task/src/main.ts diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/tsconfig.json b/src/Middleware/SpaServices/src/npm/domain-task/tsconfig.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/tsconfig.json rename to src/Middleware/SpaServices/src/npm/domain-task/tsconfig.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/package.json b/src/Middleware/SpaServices/src/package.json similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/package.json rename to src/Middleware/SpaServices/src/package.json diff --git a/src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/webpack.config.js b/src/Middleware/SpaServices/src/webpack.config.js similarity index 100% rename from src/JavaScriptServices/src/Microsoft.AspNetCore.SpaServices/webpack.config.js rename to src/Middleware/SpaServices/src/webpack.config.js From 80bb14c3ef423cea4b970cc69ff273056c277428 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 21 Dec 2018 00:11:06 -0800 Subject: [PATCH 07/80] Change build components to C++ Win10 17134 SDK (#4603) --- korebuild.json | 2 +- .../Windows/AspNetCoreModule-Setup/build/settings/common.props | 2 +- .../IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj | 2 +- src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/korebuild.json b/korebuild.json index 4a2fc587c3..4d099f3da1 100644 --- a/korebuild.json +++ b/korebuild.json @@ -17,7 +17,7 @@ "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop" + "Microsoft.VisualStudio.Component.Windows10SDK.17134" ] } } diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props index 0130b6e5ab..3dfffe943f 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props +++ b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props @@ -13,7 +13,7 @@ - 10.0.15063.0 + 10.0.17134.0 $(IisOobWinSdkVersion) Unicode bin\$(Configuration)\$(PlatformShortname)\ diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj index 7e2d840f0c..e70df818f0 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj @@ -26,7 +26,7 @@ AspNetCore aspnetcore false - 10.0.15063.0 + 10.0.17134.0 diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj index addf6ce98b..7f75ac2c1d 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj +++ b/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj @@ -23,7 +23,7 @@ Win32Proj IISLib IISLib - 10.0.15063.0 + 10.0.17134.0 From 37291ea11472005d933636ac5a2b5c7d0b7bfcd2 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 21 Dec 2018 10:58:10 -0800 Subject: [PATCH 08/80] Fix IISIntegration folder structure (#6063) --- eng/ProjectReferences.props | 2 +- src/Servers/IIS/.gitignore | 13 +- .../AspNetCore/AspNetCore.vcxproj | 4 +- .../AspNetCore/Inc/application.h | 0 .../AspNetCore/Inc/applicationmanager.h | 0 .../AspNetCore/Inc/aspnetcoreconfig.h | 0 .../AspNetCore/Inc/debugutil.h | 0 .../AspNetCore/Inc/environmentvariablehash.h | 0 .../AspNetCore/Inc/filewatcher.h | 0 .../AspNetCore/Inc/forwarderconnection.h | 0 .../AspNetCore/Inc/forwardinghandler.h | 0 .../AspNetCoreModuleV1/AspNetCore/Inc/path.h | 0 .../AspNetCore/Inc/processmanager.h | 0 .../AspNetCore/Inc/protocolconfig.h | 0 .../AspNetCore/Inc/proxymodule.h | 0 .../AspNetCore/Inc/resource.h | 0 .../AspNetCore/Inc/responseheaderhash.h | 0 .../AspNetCore/Inc/serverprocess.h | 0 .../AspNetCore/Inc/sttimer.h | 0 .../AspNetCore/Inc/websockethandler.h | 0 .../AspNetCore/Inc/winhttphelper.h | 0 .../AspNetCoreModuleV1/AspNetCore/Source.def | 0 .../AspNetCore/aspnetcore_msg.h | 0 .../AspNetCore/aspnetcore_msg.mc | 0 .../AspNetCore/aspnetcore_msg.rc | 0 .../AspNetCore/aspnetcore_schema.xml | 0 .../AspNetCore/aspnetcoremodule.rc | 0 .../AspNetCoreModuleV1/AspNetCore/resource.h | 0 .../AspNetCore/src/application.cxx | 0 .../AspNetCore/src/applicationmanager.cxx | 0 .../AspNetCore/src/aspnetcoreconfig.cxx | 0 .../AspNetCore/src/filewatcher.cxx | 0 .../AspNetCore/src/forwarderconnection.cxx | 0 .../AspNetCore/src/forwardinghandler.cxx | 0 .../AspNetCore/src/main.cxx | 0 .../AspNetCore/src/path.cxx | 0 .../AspNetCore/src/precomp.hxx | 0 .../AspNetCore/src/processmanager.cxx | 0 .../AspNetCore/src/protocolconfig.cxx | 0 .../AspNetCore/src/proxymodule.cxx | 0 .../AspNetCore/src/responseheaderhash.cxx | 0 .../AspNetCore/src/serverprocess.cxx | 0 .../AspNetCore/src/websockethandler.cxx | 0 .../AspNetCore/src/winhttphelper.cxx | 0 .../AspNetCoreModuleV1/IISLib/IISLib.vcxproj | 0 .../AspNetCoreModuleV1/IISLib/acache.cxx | 0 .../AspNetCoreModuleV1/IISLib/acache.h | 0 .../AspNetCoreModuleV1/IISLib/ahutil.cpp | 0 .../AspNetCoreModuleV1/IISLib/ahutil.h | 0 .../AspNetCoreModuleV1/IISLib/base64.cpp | 0 .../AspNetCoreModuleV1/IISLib/base64.h | 0 .../AspNetCoreModuleV1/IISLib/buffer.h | 0 .../AspNetCoreModuleV1/IISLib/datetime.h | 0 .../AspNetCoreModuleV1/IISLib/dbgutil.h | 0 .../AspNetCoreModuleV1/IISLib/hashfn.h | 0 .../AspNetCoreModuleV1/IISLib/hashtable.h | 0 .../AspNetCoreModuleV1/IISLib/listentry.h | 0 .../AspNetCoreModuleV1/IISLib/macros.h | 0 .../AspNetCoreModuleV1/IISLib/multisz.cpp | 0 .../AspNetCoreModuleV1/IISLib/multisz.h | 0 .../AspNetCoreModuleV1/IISLib/multisza.cpp | 0 .../AspNetCoreModuleV1/IISLib/multisza.h | 0 .../AspNetCoreModuleV1/IISLib/ntassert.h | 0 .../AspNetCoreModuleV1/IISLib/percpu.h | 0 .../AspNetCoreModuleV1/IISLib/precomp.h | 0 .../AspNetCoreModuleV1/IISLib/prime.h | 0 .../AspNetCoreModuleV1/IISLib/pudebug.h | 0 .../AspNetCoreModuleV1/IISLib/reftrace.c | 0 .../AspNetCoreModuleV1/IISLib/reftrace.h | 0 .../AspNetCoreModuleV1/IISLib/rwlock.h | 0 .../AspNetCoreModuleV1/IISLib/stringa.cpp | 0 .../AspNetCoreModuleV1/IISLib/stringa.h | 0 .../AspNetCoreModuleV1/IISLib/stringu.cpp | 0 .../AspNetCoreModuleV1/IISLib/stringu.h | 0 .../AspNetCoreModuleV1/IISLib/tracelog.c | 0 .../AspNetCoreModuleV1/IISLib/tracelog.h | 0 .../AspNetCoreModuleV1/IISLib/treehash.h | 0 .../AspNetCoreModuleV1/IISLib/util.cxx | 0 .../IIS/{ => AspNetCoreModuleV1}/LICENSE.txt | 0 .../Directory.Build.targets | 0 ...icrosoft.AspNetCore.AspNetCoreModule.props | 0 ...soft.AspNetCore.AspNetCoreModuleV1.pkgproj | 10 +- .../lib/netcoreapp2.1/_._ | 0 src/Servers/IIS/IISIntegration.sln | 220 ++++---- .../NuGetPackageVerifier.json | 0 .../NuGetPackageVerifier.xplat.json | 0 .../samples/IISSample/IISSample.csproj | 0 .../samples/IISSample/Startup.cs | 0 .../samples/IISSample/web.config | 0 .../src}/AuthenticationHandler.cs | 0 .../src}/ForwardedTlsConnectionFeature.cs | 0 .../src}/IISDefaults.cs | 0 .../src}/IISHostingStartup.cs | 0 .../src}/IISMiddleware.cs | 0 .../src}/IISOptions.cs | 0 .../src}/IISSetupFilter.cs | 0 ...ft.AspNetCore.Server.IISIntegration.csproj | 4 +- .../src}/NativeMethods.cs | 0 .../src}/Properties/AssemblyInfo.cs | 0 .../src}/WebHostBuilderIISExtensions.cs | 0 .../src}/baseline.netcore.json | 0 .../AppHostConfig/Http.config | 0 .../AppHostConfig/Https.config | 0 .../AppHostConfig/NtlmAuthentation.config | 0 .../WebsocketsNotSupported.config | 0 .../IISIntegration.FunctionalTests.csproj | 0 .../OutOfProcess/HelloWorldTest.cs | 0 .../OutOfProcess/HttpsTest.cs | 0 .../OutOfProcess/NtlmAuthentationTest.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../UpgradeFeatureDetectionTests.cs | 0 .../FunctionalTests}/Utilities/Helpers.cs | 0 .../test/Tests}/IISExtensionTests.cs | 0 .../test/Tests}/IISMiddlewareTests.cs | 0 ...NetCore.Server.IISIntegration.Tests.csproj | 0 .../OutOfProcessWebSite.csproj | 2 +- .../testassets/OutOfProcessWebSite/Program.cs | 0 .../OutOfProcessWebSite/StartupHelloWorld.cs | 0 .../StartupHttpsHelloWorld.cs | 0 .../StartupNtlmAuthentication.cs | 0 .../StartupUpgradeFeatureDetection.cs | 0 .../testassets/OutOfProcessWebSite/web.config | 0 src/Servers/IIS/build/testsite.props | 4 +- src/Servers/IIS/tools/certificate.ps1 | 499 ------------------ src/Servers/IIS/tools/httpsys.ps1 | 394 -------------- src/Servers/IIS/tools/installancm.ps1 | 471 ----------------- src/Servers/IIS/tools/stresstest.ps1 | 96 ---- 127 files changed, 124 insertions(+), 1595 deletions(-) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj (99%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/application.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/path.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/resource.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/Source.def (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/resource.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/application.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/main.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/path.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/IISLib.vcxproj (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/acache.cxx (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/acache.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/ahutil.cpp (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/ahutil.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/base64.cpp (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/base64.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/buffer.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/datetime.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/dbgutil.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/hashfn.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/hashtable.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/listentry.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/macros.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/multisz.cpp (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/multisz.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/multisza.cpp (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/multisza.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/ntassert.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/percpu.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/precomp.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/prime.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/pudebug.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/reftrace.c (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/reftrace.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/rwlock.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/stringa.cpp (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/stringa.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/stringu.cpp (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/stringu.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/tracelog.c (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/tracelog.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/treehash.h (100%) rename src/Servers/IIS/{src => }/AspNetCoreModuleV1/IISLib/util.cxx (100%) rename src/Servers/IIS/{ => AspNetCoreModuleV1}/LICENSE.txt (100%) rename src/Servers/IIS/{src => AspNetCoreModuleV1}/Microsoft.AspNetCore.AspNetCoreModuleV1/Directory.Build.targets (100%) rename src/Servers/IIS/{src => AspNetCoreModuleV1}/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule.props (100%) rename src/Servers/IIS/{src => AspNetCoreModuleV1}/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj (59%) rename src/Servers/IIS/{src => AspNetCoreModuleV1}/Microsoft.AspNetCore.AspNetCoreModuleV1/lib/netcoreapp2.1/_._ (100%) rename src/Servers/IIS/{ => IISIntegration}/NuGetPackageVerifier.json (100%) rename src/Servers/IIS/{ => IISIntegration}/NuGetPackageVerifier.xplat.json (100%) rename src/Servers/IIS/{ => IISIntegration}/samples/IISSample/IISSample.csproj (100%) rename src/Servers/IIS/{ => IISIntegration}/samples/IISSample/Startup.cs (100%) rename src/Servers/IIS/{ => IISIntegration}/samples/IISSample/web.config (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/AuthenticationHandler.cs (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/ForwardedTlsConnectionFeature.cs (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/IISDefaults.cs (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/IISHostingStartup.cs (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/IISMiddleware.cs (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/IISOptions.cs (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/IISSetupFilter.cs (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration.csproj (87%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/NativeMethods.cs (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/Properties/AssemblyInfo.cs (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/WebHostBuilderIISExtensions.cs (100%) rename src/Servers/IIS/{src/Microsoft.AspNetCore.Server.IISIntegration => IISIntegration/src}/baseline.netcore.json (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/AppHostConfig/Http.config (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/AppHostConfig/Https.config (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/AppHostConfig/NtlmAuthentation.config (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/AppHostConfig/WebsocketsNotSupported.config (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/IISIntegration.FunctionalTests.csproj (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/OutOfProcess/HelloWorldTest.cs (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/OutOfProcess/HttpsTest.cs (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/OutOfProcess/NtlmAuthentationTest.cs (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/Properties/AssemblyInfo.cs (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/UpgradeFeatureDetectionTests.cs (100%) rename src/Servers/IIS/{test/IISIntegration.FunctionalTests => IISIntegration/test/FunctionalTests}/Utilities/Helpers.cs (100%) rename src/Servers/IIS/{test/Microsoft.AspNetCore.Server.IISIntegration.Tests => IISIntegration/test/Tests}/IISExtensionTests.cs (100%) rename src/Servers/IIS/{test/Microsoft.AspNetCore.Server.IISIntegration.Tests => IISIntegration/test/Tests}/IISMiddlewareTests.cs (100%) rename src/Servers/IIS/{test/Microsoft.AspNetCore.Server.IISIntegration.Tests => IISIntegration/test/Tests}/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj (100%) rename src/Servers/IIS/{ => IISIntegration}/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj (91%) rename src/Servers/IIS/{ => IISIntegration}/test/testassets/OutOfProcessWebSite/Program.cs (100%) rename src/Servers/IIS/{ => IISIntegration}/test/testassets/OutOfProcessWebSite/StartupHelloWorld.cs (100%) rename src/Servers/IIS/{ => IISIntegration}/test/testassets/OutOfProcessWebSite/StartupHttpsHelloWorld.cs (100%) rename src/Servers/IIS/{ => IISIntegration}/test/testassets/OutOfProcessWebSite/StartupNtlmAuthentication.cs (100%) rename src/Servers/IIS/{ => IISIntegration}/test/testassets/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs (100%) rename src/Servers/IIS/{ => IISIntegration}/test/testassets/OutOfProcessWebSite/web.config (100%) delete mode 100644 src/Servers/IIS/tools/certificate.ps1 delete mode 100644 src/Servers/IIS/tools/httpsys.ps1 delete mode 100644 src/Servers/IIS/tools/installancm.ps1 delete mode 100644 src/Servers/IIS/tools/stresstest.ps1 diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 448b48db82..05a7e96c56 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -37,7 +37,7 @@ - + diff --git a/src/Servers/IIS/.gitignore b/src/Servers/IIS/.gitignore index dc2b157fe0..f72b4575d1 100644 --- a/src/Servers/IIS/.gitignore +++ b/src/Servers/IIS/.gitignore @@ -45,17 +45,12 @@ x64/ *.pdb *.lib *.idb -src/*/AspNetCore/aspnetcoremodule.h -src/*/AspNetCore/aspnetcore_msg.h -src/*/AspNetCore/aspnetcore_msg.rc -src/*/*/version.h -src/*/RequestHandler/version.h -src/*/CommonLib/aspnetcore_msg.h -src/*/CommonLib/aspnetcore_msg.rc +AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.h +AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h +AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc +AspNetCoreModuleV1/AspNetCore/version.h test/*/Debug test/*/Release -test/gtest-1.8.0/msvc/Debug -test/gtest-1.8.0/msvc/Release .build *.VC.*db global.json diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj similarity index 99% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj index e70df818f0..0231edecb0 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -268,7 +268,7 @@ {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - + diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/application.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/application.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/path.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/path.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/resource.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/resource.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Source.def b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Source.def similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/Source.def rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Source.def diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/resource.h b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/resource.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/resource.h rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/resource.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/application.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/application.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/main.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/main.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/path.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/path.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/IISLib.vcxproj similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/IISLib.vcxproj diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.cxx b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/acache.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/acache.cxx diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/acache.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/acache.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/acache.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/ahutil.cpp similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.cpp rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/ahutil.cpp diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/ahutil.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ahutil.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/ahutil.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/base64.cpp similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.cpp rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/base64.cpp diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/base64.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/base64.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/base64.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/buffer.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/buffer.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/buffer.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/buffer.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/datetime.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/datetime.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/datetime.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/datetime.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/dbgutil.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/dbgutil.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/dbgutil.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/dbgutil.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashfn.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/hashfn.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashfn.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/hashfn.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashtable.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/hashtable.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/hashtable.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/hashtable.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/listentry.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/listentry.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/listentry.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/listentry.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/macros.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/macros.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/macros.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/macros.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisz.cpp similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.cpp rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisz.cpp diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisz.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisz.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisz.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisza.cpp similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.cpp rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisza.cpp diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisza.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/multisza.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/multisza.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ntassert.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/ntassert.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/ntassert.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/ntassert.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/percpu.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/percpu.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/percpu.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/percpu.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/precomp.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/precomp.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/precomp.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/precomp.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/prime.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/prime.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/prime.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/prime.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/pudebug.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/pudebug.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/pudebug.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/pudebug.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.c b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/reftrace.c similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.c rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/reftrace.c diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/reftrace.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/reftrace.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/reftrace.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/rwlock.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/rwlock.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/rwlock.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/rwlock.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringa.cpp similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.cpp rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringa.cpp diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringa.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringa.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringa.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.cpp b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringu.cpp similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.cpp rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringu.cpp diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringu.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/stringu.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/stringu.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.c b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/tracelog.c similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.c rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/tracelog.c diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/tracelog.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/tracelog.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/tracelog.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/treehash.h b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/treehash.h similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/treehash.h rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/treehash.h diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/util.cxx b/src/Servers/IIS/AspNetCoreModuleV1/IISLib/util.cxx similarity index 100% rename from src/Servers/IIS/src/AspNetCoreModuleV1/IISLib/util.cxx rename to src/Servers/IIS/AspNetCoreModuleV1/IISLib/util.cxx diff --git a/src/Servers/IIS/LICENSE.txt b/src/Servers/IIS/AspNetCoreModuleV1/LICENSE.txt similarity index 100% rename from src/Servers/IIS/LICENSE.txt rename to src/Servers/IIS/AspNetCoreModuleV1/LICENSE.txt diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV1/Directory.Build.targets b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Directory.Build.targets similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV1/Directory.Build.targets rename to src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Directory.Build.targets diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule.props b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule.props similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule.props rename to src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule.props diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj similarity index 59% rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj rename to src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj index 3a5ad7aba9..29f79f80b0 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj +++ b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV1/lib/netcoreapp2.1/_._ b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/lib/netcoreapp2.1/_._ similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV1/lib/netcoreapp2.1/_._ rename to src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/lib/netcoreapp2.1/_._ diff --git a/src/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln index 85a5d7ebcd..4d7eb70c31 100644 --- a/src/Servers/IIS/IISIntegration.sln +++ b/src/Servers/IIS/IISIntegration.sln @@ -3,37 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04B1EDB6-E967-4D25-89B9-E6F8304038CD}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - NuGet.Config = NuGet.Config - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EF30B533-D715-421A-92B7-92FEF460AC9C}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "samples\IISSample\IISSample.csproj", "{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{F54715C3-88D8-49E3-A291-C13570FE81FC}" - ProjectSection(ProjectDependencies) = postProject - {439824F9-1455-4CC4-BD79-B44FA0A16552} = {439824F9-1455-4CC4-BD79-B44FA0A16552} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E-9CC8-450C-8A8D-94FC76428150}" ProjectSection(SolutionItems) = preProject build\applicationhost.config = build\applicationhost.config @@ -44,15 +13,38 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E build\testsite.props = build\testsite.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISIntegration.FunctionalTests", "test\IISIntegration.FunctionalTests\IISIntegration.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{CB89CE6B-FE5B-42EC-A1AA-4CE48B58C824}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{16E521CE-77F1-4B1C-A183-520A41C4F372}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "AspNetCoreModuleV1\IISLib\IISLib.vcxproj", "{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV1\IISLib\IISLib.vcxproj", "{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IISIntegration", "IISIntegration", "{DFD791BE-650D-4D28-B433-0F7F3396E504}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{07A39A11-7E87-48E5-8BFB-CC525DC3E338}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2130E0FD-A21F-47E9-8207-06B6A122CB4A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{996147E5-A4D4-40B8-A5B9-18E1B0F6A432}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{0C044E38-3640-4F91-8A62-3F54DC7E7F34}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "IISIntegration\samples\IISSample\IISSample.csproj", "{CDE1208E-198D-4E07-80C8-AB1E0B662A60}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISIntegration.FunctionalTests", "IISIntegration\test\FunctionalTests\IISIntegration.FunctionalTests.csproj", "{7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "IISIntegration\test\Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{E27133AD-4B60-4EC9-9DE9-56762ADA16D7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "IISIntegration\test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{3BFEF549-2F58-4449-A9FF-DAB1206C07BC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{80BFE548-9DFF-49C4-94A7-1754C3D4C339}" + ProjectSection(SolutionItems) = preProject + tools\SetupTestEnvironment.ps1 = tools\SetupTestEnvironment.ps1 + tools\update_schema.ps1 = tools\update_schema.ps1 + tools\UpdateIISExpressCertificate.ps1 = tools\UpdateIISExpressCertificate.ps1 + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -64,74 +56,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.ActiveCfg = Debug|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.Build.0 = Debug|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.ActiveCfg = Debug|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.Build.0 = Debug|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.Build.0 = Release|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.ActiveCfg = Release|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.Build.0 = Release|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.ActiveCfg = Release|Any CPU - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.Build.0 = Release|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.ActiveCfg = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.Build.0 = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.ActiveCfg = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.Build.0 = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.Build.0 = Release|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.ActiveCfg = Release|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.Build.0 = Release|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.ActiveCfg = Release|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.Build.0 = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.ActiveCfg = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.Build.0 = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.ActiveCfg = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.Build.0 = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.Build.0 = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.ActiveCfg = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.Build.0 = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.ActiveCfg = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.Build.0 = Release|Any CPU - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x64.ActiveCfg = Debug|x64 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x64.Build.0 = Debug|x64 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x86.ActiveCfg = Debug|x86 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x86.Build.0 = Debug|x86 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|Any CPU.ActiveCfg = Release|x86 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x64.ActiveCfg = Release|x64 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x64.Build.0 = Release|x64 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x86.ActiveCfg = Release|x86 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x86.Build.0 = Release|x86 - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.ActiveCfg = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.Build.0 = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.ActiveCfg = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.Build.0 = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.Build.0 = Release|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.ActiveCfg = Release|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.Build.0 = Release|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x86.ActiveCfg = Release|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x86.Build.0 = Release|Any CPU - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Debug|x64 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.ActiveCfg = Debug|Win32 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.Build.0 = Debug|Win32 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Any CPU.ActiveCfg = Release|Win32 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.ActiveCfg = Release|x64 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.Build.0 = Release|x64 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.ActiveCfg = Release|Win32 - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.Build.0 = Release|Win32 {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|Any CPU.ActiveCfg = Debug|Win32 {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.ActiveCfg = Debug|x64 {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.Build.0 = Debug|x64 @@ -142,20 +66,90 @@ Global {439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.Build.0 = Release|x64 {439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x86.ActiveCfg = Release|Win32 {439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x86.Build.0 = Release|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Debug|x64 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.ActiveCfg = Debug|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.Build.0 = Debug|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Any CPU.ActiveCfg = Release|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.ActiveCfg = Release|x64 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.Build.0 = Release|x64 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.ActiveCfg = Release|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.Build.0 = Release|Win32 + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|x64.ActiveCfg = Debug|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|x64.Build.0 = Debug|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|x86.ActiveCfg = Debug|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Debug|x86.Build.0 = Debug|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|Any CPU.Build.0 = Release|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|x64.ActiveCfg = Release|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|x64.Build.0 = Release|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|x86.ActiveCfg = Release|Any CPU + {0C044E38-3640-4F91-8A62-3F54DC7E7F34}.Release|x86.Build.0 = Release|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|x64.ActiveCfg = Debug|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|x64.Build.0 = Debug|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|x86.ActiveCfg = Debug|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Debug|x86.Build.0 = Debug|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|Any CPU.Build.0 = Release|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|x64.ActiveCfg = Release|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|x64.Build.0 = Release|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|x86.ActiveCfg = Release|Any CPU + {CDE1208E-198D-4E07-80C8-AB1E0B662A60}.Release|x86.Build.0 = Release|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|x64.ActiveCfg = Debug|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|x64.Build.0 = Debug|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|x86.ActiveCfg = Debug|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Debug|x86.Build.0 = Debug|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|Any CPU.Build.0 = Release|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|x64.ActiveCfg = Release|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|x64.Build.0 = Release|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|x86.ActiveCfg = Release|Any CPU + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92}.Release|x86.Build.0 = Release|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|x64.ActiveCfg = Debug|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|x64.Build.0 = Debug|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|x86.ActiveCfg = Debug|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Debug|x86.Build.0 = Debug|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|Any CPU.Build.0 = Release|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|x64.ActiveCfg = Release|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|x64.Build.0 = Release|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|x86.ActiveCfg = Release|Any CPU + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1}.Release|x86.Build.0 = Release|Any CPU + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Debug|Any CPU.ActiveCfg = Debug|x86 + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Debug|x64.ActiveCfg = Debug|x64 + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Debug|x64.Build.0 = Debug|x64 + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Debug|x86.ActiveCfg = Debug|x86 + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Debug|x86.Build.0 = Debug|x86 + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Release|Any CPU.ActiveCfg = Release|x86 + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Release|x64.ActiveCfg = Release|x64 + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Release|x64.Build.0 = Release|x64 + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Release|x86.ActiveCfg = Release|x86 + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9} - {8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} - {4106DB10-E09F-480E-9CE6-B39235512EE6} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {F54715C3-88D8-49E3-A291-C13570FE81FC} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {16E521CE-77F1-4B1C-A183-520A41C4F372} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} - {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {16E521CE-77F1-4B1C-A183-520A41C4F372} - {439824F9-1455-4CC4-BD79-B44FA0A16552} = {16E521CE-77F1-4B1C-A183-520A41C4F372} + {439824F9-1455-4CC4-BD79-B44FA0A16552} = {CB89CE6B-FE5B-42EC-A1AA-4CE48B58C824} + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {CB89CE6B-FE5B-42EC-A1AA-4CE48B58C824} + {07A39A11-7E87-48E5-8BFB-CC525DC3E338} = {DFD791BE-650D-4D28-B433-0F7F3396E504} + {2130E0FD-A21F-47E9-8207-06B6A122CB4A} = {DFD791BE-650D-4D28-B433-0F7F3396E504} + {996147E5-A4D4-40B8-A5B9-18E1B0F6A432} = {DFD791BE-650D-4D28-B433-0F7F3396E504} + {0C044E38-3640-4F91-8A62-3F54DC7E7F34} = {2130E0FD-A21F-47E9-8207-06B6A122CB4A} + {CDE1208E-198D-4E07-80C8-AB1E0B662A60} = {07A39A11-7E87-48E5-8BFB-CC525DC3E338} + {7C51C3DB-C835-404B-A8F1-0B5F4E23DA92} = {996147E5-A4D4-40B8-A5B9-18E1B0F6A432} + {7CE4E466-3CD9-4264-9BC7-9A4FF333C8A1} = {996147E5-A4D4-40B8-A5B9-18E1B0F6A432} + {E27133AD-4B60-4EC9-9DE9-56762ADA16D7} = {996147E5-A4D4-40B8-A5B9-18E1B0F6A432} + {3BFEF549-2F58-4449-A9FF-DAB1206C07BC} = {E27133AD-4B60-4EC9-9DE9-56762ADA16D7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/src/Servers/IIS/NuGetPackageVerifier.json b/src/Servers/IIS/IISIntegration/NuGetPackageVerifier.json similarity index 100% rename from src/Servers/IIS/NuGetPackageVerifier.json rename to src/Servers/IIS/IISIntegration/NuGetPackageVerifier.json diff --git a/src/Servers/IIS/NuGetPackageVerifier.xplat.json b/src/Servers/IIS/IISIntegration/NuGetPackageVerifier.xplat.json similarity index 100% rename from src/Servers/IIS/NuGetPackageVerifier.xplat.json rename to src/Servers/IIS/IISIntegration/NuGetPackageVerifier.xplat.json diff --git a/src/Servers/IIS/samples/IISSample/IISSample.csproj b/src/Servers/IIS/IISIntegration/samples/IISSample/IISSample.csproj similarity index 100% rename from src/Servers/IIS/samples/IISSample/IISSample.csproj rename to src/Servers/IIS/IISIntegration/samples/IISSample/IISSample.csproj diff --git a/src/Servers/IIS/samples/IISSample/Startup.cs b/src/Servers/IIS/IISIntegration/samples/IISSample/Startup.cs similarity index 100% rename from src/Servers/IIS/samples/IISSample/Startup.cs rename to src/Servers/IIS/IISIntegration/samples/IISSample/Startup.cs diff --git a/src/Servers/IIS/samples/IISSample/web.config b/src/Servers/IIS/IISIntegration/samples/IISSample/web.config similarity index 100% rename from src/Servers/IIS/samples/IISSample/web.config rename to src/Servers/IIS/IISIntegration/samples/IISSample/web.config diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs b/src/Servers/IIS/IISIntegration/src/AuthenticationHandler.cs similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs rename to src/Servers/IIS/IISIntegration/src/AuthenticationHandler.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs b/src/Servers/IIS/IISIntegration/src/ForwardedTlsConnectionFeature.cs similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs rename to src/Servers/IIS/IISIntegration/src/ForwardedTlsConnectionFeature.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs b/src/Servers/IIS/IISIntegration/src/IISDefaults.cs similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs rename to src/Servers/IIS/IISIntegration/src/IISDefaults.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs b/src/Servers/IIS/IISIntegration/src/IISHostingStartup.cs similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs rename to src/Servers/IIS/IISIntegration/src/IISHostingStartup.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs b/src/Servers/IIS/IISIntegration/src/IISMiddleware.cs similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs rename to src/Servers/IIS/IISIntegration/src/IISMiddleware.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs b/src/Servers/IIS/IISIntegration/src/IISOptions.cs similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs rename to src/Servers/IIS/IISIntegration/src/IISOptions.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs b/src/Servers/IIS/IISIntegration/src/IISSetupFilter.cs similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs rename to src/Servers/IIS/IISIntegration/src/IISSetupFilter.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj similarity index 87% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj rename to src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj index 2bddeaaabb..80365a8002 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -15,10 +15,10 @@ - + False - + False diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs b/src/Servers/IIS/IISIntegration/src/NativeMethods.cs similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs rename to src/Servers/IIS/IISIntegration/src/NativeMethods.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs b/src/Servers/IIS/IISIntegration/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs rename to src/Servers/IIS/IISIntegration/src/Properties/AssemblyInfo.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs b/src/Servers/IIS/IISIntegration/src/WebHostBuilderIISExtensions.cs similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs rename to src/Servers/IIS/IISIntegration/src/WebHostBuilderIISExtensions.cs diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json b/src/Servers/IIS/IISIntegration/src/baseline.netcore.json similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json rename to src/Servers/IIS/IISIntegration/src/baseline.netcore.json diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config b/src/Servers/IIS/IISIntegration/test/FunctionalTests/AppHostConfig/Http.config similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/AppHostConfig/Http.config diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config b/src/Servers/IIS/IISIntegration/test/FunctionalTests/AppHostConfig/Https.config similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/AppHostConfig/Https.config diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config b/src/Servers/IIS/IISIntegration/test/FunctionalTests/AppHostConfig/NtlmAuthentation.config similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/AppHostConfig/NtlmAuthentation.config diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config b/src/Servers/IIS/IISIntegration/test/FunctionalTests/AppHostConfig/WebsocketsNotSupported.config similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/AppHostConfig/WebsocketsNotSupported.config diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HelloWorldTest.cs similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HelloWorldTest.cs diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HttpsTest.cs similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HttpsTest.cs diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/Properties/AssemblyInfo.cs diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/UpgradeFeatureDetectionTests.cs similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/UpgradeFeatureDetectionTests.cs diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/Utilities/Helpers.cs similarity index 100% rename from src/Servers/IIS/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs rename to src/Servers/IIS/IISIntegration/test/FunctionalTests/Utilities/Helpers.cs diff --git a/src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs b/src/Servers/IIS/IISIntegration/test/Tests/IISExtensionTests.cs similarity index 100% rename from src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs rename to src/Servers/IIS/IISIntegration/test/Tests/IISExtensionTests.cs diff --git a/src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs b/src/Servers/IIS/IISIntegration/test/Tests/IISMiddlewareTests.cs similarity index 100% rename from src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs rename to src/Servers/IIS/IISIntegration/test/Tests/IISMiddlewareTests.cs diff --git a/src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj similarity index 100% rename from src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj rename to src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj similarity index 91% rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj rename to src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj index 1b08374643..ca0d979dec 100644 --- a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ b/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -1,6 +1,6 @@ - + $(StandardTestTfms) diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Program.cs b/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/Program.cs similarity index 100% rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/Program.cs rename to src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/Program.cs diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/StartupHelloWorld.cs b/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/StartupHelloWorld.cs similarity index 100% rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/StartupHelloWorld.cs rename to src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/StartupHelloWorld.cs diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/StartupHttpsHelloWorld.cs b/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/StartupHttpsHelloWorld.cs similarity index 100% rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/StartupHttpsHelloWorld.cs rename to src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/StartupHttpsHelloWorld.cs diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/StartupNtlmAuthentication.cs b/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/StartupNtlmAuthentication.cs similarity index 100% rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/StartupNtlmAuthentication.cs rename to src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/StartupNtlmAuthentication.cs diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs b/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs similarity index 100% rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs rename to src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/web.config b/src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/web.config similarity index 100% rename from src/Servers/IIS/test/testassets/OutOfProcessWebSite/web.config rename to src/Servers/IIS/IISIntegration/test/testassets/OutOfProcessWebSite/web.config diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index d1f746bb2e..76714bf735 100644 --- a/src/Servers/IIS/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -29,8 +29,8 @@ - - + + diff --git a/src/Servers/IIS/tools/certificate.ps1 b/src/Servers/IIS/tools/certificate.ps1 deleted file mode 100644 index 52c8817796..0000000000 --- a/src/Servers/IIS/tools/certificate.ps1 +++ /dev/null @@ -1,499 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. - -<############################################################################## - Example - - ############################################################################### - # Create a new root certificate on "Cert:\LocalMachine\My" and export it to "Cert:\LocalMachine\Root" - # FYI, you can do the same thing with one of the following commands: - # %sdxroot\tools\amd64\MakeCert.exe -r -pe -n "CN=ANCMTest_Root" -b 12/22/2013 -e 12/23/2020 -ss root -sr localmachine -len 2048 -a sha256 - # $thumbPrint = (New-SelfSignedCertificate -DnsName "ANCMTest_Root", "ANCMTest_Roo3" -CertStoreLocation "cert:\LocalMachine\My").Thumbprint - ############################################################################### - $rootSubject = "ANCMTest_Root" - $thumbPrint = .\certificate.ps1 -Command Create-SelfSignedCertificate -Subject $rootSubject - .\certificate.ps1 -Command Export-CertificateTo -TargetThumbPrint $thumbPrint -TargetSSLStore "Cert:\LocalMachine\My" -ExportToSSLStore "Cert:\LocalMachine\Root" - .\certificate.ps1 -Command Get-CertificateThumbPrint -Subject $rootSubject -TargetSSLStore "Cert:\LocalMachine\Root" - - ############################################################################### - # Create a new certificate setting issuer with the root certicate's subject name on "Cert:\LocalMachine\My" and export it to "Cert:\LocalMachine\Root" - # FYI, you can do the same thing with one of the following commands: - # %sdxroot\tools\amd64\MakeCert.exe -pe -n "CN=ANCMTestWebServer" -b 12/22/2013 -e 12/23/2020 -eku 1.3.6.1.5.5.7.3.1 -is root -ir localmachine -in $rootSubject -len 2048 -ss my -sr localmachine -a sha256 - # %sdxroot\tools\amd64\MakeCert.exe -pe -n "CN=ANCMTest_Client" -eku 1.3.6.1.5.5.7.3.2 -is root -ir localmachine -in ANCMTest_Root -ss my -sr currentuser -len 2048 -a sha256 - ############################################################################### - $childSubject = "ANCMTest_Client" - $thumbPrint2 = .\certificate.ps1 -Command Create-SelfSignedCertificate -Subject $childSubject -IssuerName $rootSubject - ("Result: $thumbPrint2") - .\certificate.ps1 -Command Export-CertificateTo -TargetThumbPrint $thumbPrint2 -TargetSSLStore "Cert:\LocalMachine\My" -ExportToSSLStore "Cert:\CurrentUser\My" - - .\certificate.ps1 -Command Export-CertificateTo -TargetThumbPrint $thumbPrint2 -TargetSSLStore "Cert:\LocalMachine\My" -ExportToSSLStore C:\gitroot\AspNetCoreModule\tools\test.pfx -PfxPassword test - - - # Clean up - .\certificate.ps1 -Command Delete-Certificate -TargetThumbPrint $thumbPrint2 -TargetSSLStore "Cert:\LocalMachine\My" - .\certificate.ps1 -Command Delete-Certificate -TargetThumbPrint $thumbPrint2 -TargetSSLStore "Cert:\CurrentUser\Root" - .\certificate.ps1 -Command Delete-Certificate -TargetThumbPrint $thumbPrint -TargetSSLStore "Cert:\LocalMachine\My" - .\certificate.ps1 -Command Delete-Certificate -TargetThumbPrint $thumbPrint -TargetSSLStore "Cert:\LocalMachine\Root" - -###############################################################################> - - -Param( - [parameter(Mandatory=$true , Position=0)] - [ValidateSet("Create-SelfSignedCertificate", - "Delete-Certificate", - "Export-CertificateTo", - "Get-CertificateThumbPrint", - "Get-CertificatePublicKey")] - [string] - $Command, - - [parameter()] - [string] - $Subject, - - [parameter()] - [string] - $IssuerName, - - [Parameter()] - [string] - $FriendlyName = "", - - [Parameter()] - [string[]] - $AlternativeNames = "", - - [Parameter()] - [string] - $TargetSSLStore = "", - - [Parameter()] - [string] - $ExportToSSLStore = "", - - [Parameter()] - [string] - $PfxPassword = "", - - [Parameter()] - [string] - $TargetThumbPrint = "" -) - -function Create-SelfSignedCertificate($_subject, $_friendlyName, $_alternativeNames, $_issuerName) { - - if (-not $_subject) - { - return ("Error!!! _subject is required") - } - - # - # $_issuerName should be set with the value subject and its certificate path will be root path - if (-not $_issuerName) - { - $_issuerName = $_subject - } - - # - # Create $subjectDn and $issuerDn - $subjectDn = new-object -com "X509Enrollment.CX500DistinguishedName" - $subjectDn.Encode( "CN=" + $_subject, $subjectDn.X500NameFlags.X500NameFlags.XCN_CERT_NAME_STR_NONE) - $issuerDn = new-object -com "X509Enrollment.CX500DistinguishedName" - $issuerDn.Encode("CN=" + $_issuerName, $subjectDn.X500NameFlags.X500NameFlags.XCN_CERT_NAME_STR_NONE) - - # - # Create a new Private Key - $key = new-object -com "X509Enrollment.CX509PrivateKey" - $key.ProviderName = "Microsoft Enhanced RSA and AES Cryptographic Provider" - # XCN_AT_SIGNATURE, The key can be used for signing - $key.KeySpec = 2 - $key.Length = 2048 - # MachineContext 0: Current User, 1: Local Machine - $key.MachineContext = 1 - $key.Create() - - # - # Create a cert object with the newly created private key - $cert = new-object -com "X509Enrollment.CX509CertificateRequestCertificate" - $cert.InitializeFromPrivateKey(2, $key, "") - $cert.Subject = $subjectDn - $cert.Issuer = $issuerDn - $cert.NotBefore = (get-date).AddMinutes(-10) - $cert.NotAfter = $cert.NotBefore.AddYears(2) - - #Use Sha256 - $hashAlgorithm = New-Object -ComObject X509Enrollment.CObjectId - $hashAlgorithm.InitializeFromAlgorithmName(1,0,0,"SHA256") - $cert.HashAlgorithm = $hashAlgorithm - - # - # Key usage should be set for non-root certificate - if ($_issuerName -ne $_subject) - { - # - # Extended key usage - $clientAuthOid = New-Object -ComObject "X509Enrollment.CObjectId" - $clientAuthOid.InitializeFromValue("1.3.6.1.5.5.7.3.2") - $serverAuthOid = new-object -com "X509Enrollment.CObjectId" - $serverAuthOid.InitializeFromValue("1.3.6.1.5.5.7.3.1") - $ekuOids = new-object -com "X509Enrollment.CObjectIds.1" - $ekuOids.add($clientAuthOid) - $ekuOids.add($serverAuthOid) - $ekuExt = new-object -com "X509Enrollment.CX509ExtensionEnhancedKeyUsage" - $ekuExt.InitializeEncode($ekuOids) - $cert.X509Extensions.Add($ekuext) - - # - #Set Key usage - $keyUsage = New-Object -com "X509Enrollment.cx509extensionkeyusage" - # XCN_CERT_KEY_ENCIPHERMENT_KEY_USAGE - $flags = 0x20 - # XCN_CERT_DIGITAL_SIGNATURE_KEY_USAGE - $flags = $flags -bor 0x80 - $keyUsage.InitializeEncode($flags) - $cert.X509Extensions.Add($keyUsage) - } - - # - # Subject alternative names - if ($_alternativeNames -ne $null) { - $names = new-object -com "X509Enrollment.CAlternativeNames" - $altNames = new-object -com "X509Enrollment.CX509ExtensionAlternativeNames" - foreach ($n in $_alternativeNames) { - $name = new-object -com "X509Enrollment.CAlternativeName" - # Dns Alternative Name - $name.InitializeFromString(3, $n) - $names.Add($name) - } - $altNames.InitializeEncode($names) - $cert.X509Extensions.Add($altNames) - } - - $cert.Encode() - - #$locator = $(New-Object "System.Guid").ToString() - $locator = [guid]::NewGuid().ToString() - $enrollment = new-object -com "X509Enrollment.CX509Enrollment" - $enrollment.CertificateFriendlyName = $locator - $enrollment.InitializeFromRequest($cert) - $certdata = $enrollment.CreateRequest(0) - $enrollment.InstallResponse(2, $certdata, 0, "") - - # Wait for certificate to be populated - $end = $(Get-Date).AddSeconds(1) - do { - $Certificates = Get-ChildItem Cert:\LocalMachine\My - foreach ($item in $Certificates) - { - if ($item.FriendlyName -eq $locator) - { - $CACertificate = $item - } - } - } while ($CACertificate -eq $null -and $(Get-Date) -lt $end) - - $thumbPrint = "" - if ($CACertificate -and $CACertificate.Thumbprint) - { - $thumbPrint = $CACertificate.Thumbprint.Trim() - } - return $thumbPrint -} - -function Delete-Certificate($_targetThumbPrint, $_targetSSLStore = $TargetSSLStore) { - - if (-not $_targetThumbPrint) - { - return ("Error!!! _targetThumbPrint is required") - } - - if (Test-Path "$_targetSSLStore\$_targetThumbPrint") - { - Remove-Item "$_targetSSLStore\$_targetThumbPrint" -Force -Confirm:$false - } - - if (Test-Path "$_targetSSLStore\$_targetThumbPrint") - { - return ("Error!!! Failed to delete a certificate of $_targetThumbPrint") - } -} - -function Export-CertificateTo($_targetThumbPrint, $_exportToSSLStore, $_password) -{ - if (-not $_targetThumbPrint) - { - return ("Error!!! _targetThumbPrint is required") - } - - if (-not (Test-Path "$TargetSSLStore\$_targetThumbPrint")) - { - return ("Error!!! Export failed. Can't find target certificate: $TargetSSLStore\$_targetThumbPrint") - } - - $cert = Get-Item "$TargetSSLStore\$_targetThumbPrint" - $tempExportFile = "$env:temp\_tempCertificate.cer" - if (Test-Path $tempExportFile) - { - Remove-Item $tempExportFile -Force -Confirm:$false - } - - $isThisWin7 = $false - $exportToSSLStoreName = $null - $exportToSSLStoreLocation = $null - $targetSSLStoreName = $null - $targetSSLStoreLocation = $null - - if ((Get-Command Export-Certificate 2> out-null) -eq $null) - { - $isThisWin7 = $true - } - - # if _exportToSSLStore points to a .pfx file - if ($exportToSSLStore.ToLower().EndsWith(".pfx")) - { - if (-not $_password) - { - return ("Error!!! _password is required") - } - - if ($isThisWin7) - { - if ($TargetSSLStore.ToLower().Contains("my")) - { - $targetSSLStoreName = "My" - } - elseif ($_exportToSSLStore.ToLower().Contains("root")) - { - $targetSSLStoreName = "Root" - } - else - { - throw ("Unsupported store name " + $TargetSSLStore) - } - if ($TargetSSLStore.ToLower().Contains("localmachine")) - { - $targetSSLStoreLocation = "LocalMachine" - } - else - { - throw ("Unsupported store location name " + $TargetSSLStore) - } - - &certutil.exe @('-exportpfx', '-p', $_password, $targetSSLStoreName, $_targetThumbPrint, $_exportToSSLStore) | out-null - - if ( Test-Path $_exportToSSLStore ) - { - # Succeeded to export to .pfx file - return - } - else - { - return ("Error!!! Can't export $TargetSSLStore\$_targetThumbPrint to $tempExportFile") - } - } - else - { - $securedPassword = ConvertTo-SecureString -String $_password -Force –AsPlainText - $exportedPfxFile = Export-PfxCertificate -FilePath $_exportToSSLStore -Cert $TargetSSLStore\$_targetThumbPrint -Password $securedPassword - if ( ($exportedPfxFile -ne $null) -and (Test-Path $exportedPfxFile.FullName) ) - { - # Succeeded to export to .pfx file - return - } - else - { - return ("Error!!! Can't export $TargetSSLStore\$_targetThumbPrint to $tempExportFile") - } - } - } - - if ($isThisWin7) - { - # Initialize variables for Win7 - if ($_exportToSSLStore.ToLower().Contains("my")) - { - $exportToSSLStoreName = [System.Security.Cryptography.X509Certificates.StoreName]::My - } - elseif ($_exportToSSLStore.ToLower().Contains("root")) - { - $exportToSSLStoreName = [System.Security.Cryptography.X509Certificates.StoreName]::Root - } - else - { - throw ("Unsupported store name " + $_exportToSSLStore) - } - if ($_exportToSSLStore.ToLower().Contains("localmachine")) - { - $exportToSSLStoreLocation = [System.Security.Cryptography.X509Certificates.StoreLocation]::LocalMachine - } - elseif ($_exportToSSLStore.ToLower().Contains("currentuser")) - { - $exportToSSLStoreLocation = [System.Security.Cryptography.X509Certificates.StoreLocation]::CurrentUser - } - else - { - throw ("Unsupported store location name " + $_exportToSSLStore) - } - - # Export-Certificate is not available. - $isThisWin7 = $true - $certificate = Get-Item "$TargetSSLStore\$_targetThumbPrint" - $base64certificate = @" ------BEGIN CERTIFICATE----- -$([Convert]::ToBase64String($certificate.Export('Cert'), [System.Base64FormattingOptions]::InsertLineBreaks))) ------END CERTIFICATE----- -"@ - Set-Content -Path $tempExportFile -Value $base64certificate | Out-Null - } - else - { - Export-Certificate -Cert $cert -FilePath $tempExportFile | Out-Null - if (-not (Test-Path $tempExportFile)) - { - return ("Error!!! Can't export $TargetSSLStore\$_targetThumbPrint to $tempExportFile") - } - } - - if ($isThisWin7) - { - [Reflection.Assembly]::Load("System.Security, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a") | Out-Null - $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($tempExportFile) - $store = New-Object System.Security.Cryptography.X509Certificates.X509Store($exportToSSLStoreName,$exportToSSLStoreLocation) - $store.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::ReadWrite) | Out-Null - $store.Add($cert) | Out-Null - } - else - { - # clean up destination SSL store - Delete-Certificate $_targetThumbPrint $_exportToSSLStore - if (Test-Path "$_exportToSSLStore\$_targetThumbPrint") - { - return ("Error!!! Can't delete already existing one $_exportToSSLStore\$_targetThumbPrint") - } - Import-Certificate -CertStoreLocation $_exportToSSLStore -FilePath $tempExportFile | Out-Null - } - - Sleep 3 - if (-not (Test-Path "$_exportToSSLStore\$_targetThumbPrint")) - { - return ("Error!!! Can't copy $TargetSSLStore\$_targetThumbPrint to $_exportToSSLStore") - } -} - -function Get-CertificateThumbPrint($_subject, $_issuerName, $_targetSSLStore) -{ - if (-not $_subject) - { - return ("Error!!! _subject is required") - } - if (-not $_targetSSLStore) - { - return ("Error!!! _targetSSLStore is required") - } - - if (-not (Test-Path "$_targetSSLStore")) - { - return ("Error!!! Can't find target store") - } - - $targetCertificate = $null - - $Certificates = Get-ChildItem $_targetSSLStore - foreach ($item in $Certificates) - { - $findItem = $false - # check subject name first - if ($item.Subject.ToLower() -eq "CN=$_subject".ToLower()) - { - $findItem = $true - } - - # check issuerName as well - if ($_issuerName -and $item.Issuer.ToLower() -ne "CN=$_issuerName".ToLower()) - { - $findItem = $false - } - - if ($findItem) - { - $targetCertificate = $item - break - } - } - $result = "" - if ($targetCertificate) - { - $result = $targetCertificate.Thumbprint - } - else - { - ("Error!!! Can't find target certificate") - } - return $result -} - -function Get-CertificatePublicKey($_targetThumbPrint) -{ - if (-not $_targetThumbPrint) - { - return ("Error!!! _targetThumbPrint is required") - } - - if (-not (Test-Path "$TargetSSLStore\$_targetThumbPrint")) - { - return ("Error!!! Can't find target certificate") - } - - $cert = Get-Item "$TargetSSLStore\$_targetThumbPrint" - $byteArray = $cert.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Cert) - $publicKey = [System.Convert]::ToBase64String($byteArray).Trim() - - return $publicKey -} - -# Error handling and initializing default values -if (-not $TargetSSLStore) -{ - $TargetSSLStore = "Cert:\LocalMachine\My" -} -else -{ - if ($Command -eq "Create-SelfSignedCertificate") - { - return ("Error!!! Create-SelfSignedCertificate should use default value for -TargetSSLStore if -Issuer is not provided") - } -} - -if (-not $ExportToSSLStore) -{ - $ExportToSSLStore = "Cert:\LocalMachine\Root" -} - -switch ($Command) -{ - "Create-SelfSignedCertificate" - { - return Create-SelfSignedCertificate $Subject $FriendlyName $AlternativeNames $IssuerName - } - "Delete-Certificate" - { - return Delete-Certificate $TargetThumbPrint - } - "Export-CertificateTo" - { - return Export-CertificateTo $TargetThumbPrint $ExportToSSLStore $PfxPassword - } - "Get-CertificateThumbPrint" - { - return Get-CertificateThumbPrint $Subject $IssuerName $TargetSSLStore - } - "Get-CertificatePublicKey" - { - return Get-CertificatePublicKey $TargetThumbPrint - } - default - { - throw "Unknown command" - } -} diff --git a/src/Servers/IIS/tools/httpsys.ps1 b/src/Servers/IIS/tools/httpsys.ps1 deleted file mode 100644 index af2254e96f..0000000000 --- a/src/Servers/IIS/tools/httpsys.ps1 +++ /dev/null @@ -1,394 +0,0 @@ -# Copyright (c) .NET Foundation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. - -############################################################################## -# Example -# $result = .\httpsys.ps1 -Command Get-SslBinding -IpAddress "0x00" -Port 46300 -# .\httpsys.ps1 -Command Add-SslBinding -IpAddress "0x00" -Port 46300 –Thumbprint $result.CertificateHash -# .\httpsys.ps1 -Command Delete-SslBinding -IpAddress "0x00" -Port 46300 -############################################################################## - -Param ( - [parameter(Mandatory=$true , Position=0)] - [ValidateSet("Add-SslBinding", - "Delete-SslBinding", - "Get-SslBinding")] - [string] - $Command, - - [parameter()] - [string] - $IpAddress, - - [parameter()] - [string] - $Port, - - [parameter()] - [string] - $Thumbprint, - - [parameter()] - [string] - $TargetSSLStore, - - [parameter()] - [string] - $AppId, - - [parameter()] - [System.Net.IPEndPoint] - $IpEndPoint - ) - - -# adjust parameter variables -if (-not $IpEndPoint) -{ - if ($IpAddress -and $Port) - { - $IpEndPoint = New-Object "System.Net.IPEndPoint" -ArgumentList $IpAddress,$Port - } -} - -if (-not $TargetSSLStore) -{ - $TargetSSLStore = "Cert:\LocalMachine\My" -} - -$StoreName = ($TargetSSLStore.Split("\") | Select-Object -Last 1).Trim() - -$Certificate = Get-Item "$TargetSSLStore\$Thumbprint" - -if (-not $AppId) -{ - # Assign a random GUID for $AppId - $AppId = [guid]::NewGuid() -} - -$cs = ' -namespace Microsoft.IIS.Administration.Setup { -using System; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.Net; -using System.Runtime.InteropServices; -using System.Security.Cryptography.X509Certificates; -using System.Text; -using System.ComponentModel; - - public class Http { - public const int HTTP_INITIALIZE_CONFIG = 2; - public const int HTTP_SERVICE_CONFIG_SSLCERT_INFO = 1; - - [DllImport("httpapi.dll", CharSet = CharSet.Auto, PreserveSig = true)] - public static extern uint HttpDeleteServiceConfiguration(IntPtr ServiceHandle, int ConfigId, ref HTTP_SERVICE_CONFIG_SSL_SET pConfigInformation, int ConfigInformationLength, IntPtr pOverlapped); - - [DllImport("httpapi.dll", CharSet = CharSet.Auto, PreserveSig = true)] - public static extern uint HttpInitialize(HTTPAPI_VERSION version, uint flags, IntPtr pReserved); - - [DllImport("httpapi.dll", EntryPoint = "HttpQueryServiceConfiguration", - CharSet = CharSet.Unicode, ExactSpelling = true, - CallingConvention = CallingConvention.StdCall)] - public static extern uint HttpQueryServiceConfiguration( - IntPtr serviceHandle, - HTTP_SERVICE_CONFIG_ID configID, - ref HTTP_SERVICE_CONFIG_SSL_QUERY pInputConfigInfo, - UInt32 InputConfigInfoLength, - IntPtr pOutputConfigInfo, - UInt32 OutputConfigInfoLength, - [In, Out] ref UInt32 pReturnLength, - IntPtr pOverlapped - ); - - [DllImport("httpapi.dll", CharSet = CharSet.Auto, PreserveSig = true)] - public static extern uint HttpSetServiceConfiguration(IntPtr ServiceHandle, int ConfigId, ref HTTP_SERVICE_CONFIG_SSL_SET pConfigInformation, int ConfigInformationLength, IntPtr pOverlapped); - - [DllImport("httpapi.dll", CharSet = CharSet.Auto, PreserveSig = true)] - public static extern uint HttpTerminate(uint flags, IntPtr pReserved); - - public static HTTP_SERVICE_CONFIG_SSL_SET MarshalConfigSslSet(IntPtr ptr) { - return (HTTP_SERVICE_CONFIG_SSL_SET)Marshal.PtrToStructure(ptr, typeof(HTTP_SERVICE_CONFIG_SSL_SET)); - } - } - - public enum HTTP_SERVICE_CONFIG_ID { - HttpServiceConfigIPListenList, - HttpServiceConfigSSLCertInfo, - HttpServiceConfigUrlAclInfo, - HttpServiceConfigMax - } - - public enum HTTP_SERVICE_CONFIG_QUERY_TYPE { - HttpServiceConfigQueryExact, - HttpServiceConfigQueryNext, - HttpServiceConfigQueryMax - } - - [StructLayout(LayoutKind.Sequential)] - public struct HTTPAPI_VERSION { - public ushort HttpApiMajorVersion; - public ushort HttpApiMinorVersion; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] - public struct HTTP_SERVICE_CONFIG_SSL_KEY { - public IntPtr pIpPort; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] - public struct HTTP_SERVICE_CONFIG_SSL_QUERY { - public HTTP_SERVICE_CONFIG_QUERY_TYPE QueryDesc; - public IntPtr KeyDesc; - public Int32 dwToken; - } - - [StructLayout(LayoutKind.Sequential)] - public struct HTTP_SERVICE_CONFIG_SSL_SET { - public IntPtr KeyDesc; - public uint SslHashLength; - public IntPtr pSslHash; - public Guid AppId; - [MarshalAs(UnmanagedType.LPWStr)] - public string pSslCertStoreName; - public int DefaultCertCheckMode; - public int DefaultRevocationFreshnessTime; - public int DefaultRecovationUrlRetrievalTimeout; - [MarshalAs(UnmanagedType.LPWStr)] - public string pDefaultSslCtlIdentifier; - [MarshalAs(UnmanagedType.LPWStr)] - public string pDefaultSslCtlStoreName; - public int DefaultFlags; - } -} -' - -$SUCCESS = 0 -function InitializeInterop() { - try { - [Microsoft.IIS.Administration.Setup.Http] | Out-Null - } - catch { - Add-Type $cs - } -} - -function GetIpEndpointBytes($_ipEndpoint) { - $socketAddress = $_ipEndpoint.Serialize() - $ipBytes = [System.Array]::CreateInstance([System.Byte], $socketAddress.Size) - for ($i = 0; $i -lt $socketAddress.Size; $i++) { - $ipBytes[$i] = $socketAddress[$i] - } - return $ipBytes -} - -function GetBindingInfo($sslConfig) { - $hash = [System.Array]::CreateInstance([System.Byte], [int]($sslConfig.SslHashLength)) - [System.Runtime.InteropServices.Marshal]::Copy($sslConfig.pSslHash, $hash, 0, $sslConfig.SslHashLength) - - $socketAddressLength = 16 - $sa = [System.Array]::CreateInstance([System.Byte], $socketAddressLength) - [System.Runtime.InteropServices.Marshal]::Copy($sslConfig.KeyDesc, $sa, 0, $socketAddressLength) - $socketAddress = New-Object "System.Net.SocketAddress" -ArgumentList ([System.Net.Sockets.AddressFamily]::InterNetwork, $socketAddressLength) - for ($i = 0; $i -lt $sa.Length; $i++) { - $socketAddress[$i] = $sa[$i] - } - - $ep = New-Object "System.Net.IPEndPoint" -ArgumentList ([ipaddress]::Any, 0) - $endpoint = [System.Net.IPEndPoint]$ep.Create($socketAddress) - - $ret = @{} - $ret.CertificateHash = [System.BitConverter]::ToString($hash).Replace("-", "") - $ret.AppId = $sslConfig.AppId - $ret.IpEndpoint = $endpoint - return $ret -} - -function InitializeHttpSys() { - $v = New-Object "Microsoft.IIS.Administration.Setup.HTTPAPI_VERSION" - $V.HttpApiMajorVersion = 1 - $v.HttpApiMinorVersion = 0 - - $result = [Microsoft.IIS.Administration.Setup.Http]::HttpInitialize($v, [Microsoft.IIS.Administration.Setup.Http]::HTTP_INITIALIZE_CONFIG, [System.IntPtr]::Zero) - - if ($result -ne $SUCCESS) { - Write-Warning "Error initializing Http API" - throw [System.ComponentModel.Win32Exception] $([System.int32]$result) - } - - return $result -} - -function TerminateHttpSys() { - return [Microsoft.IIS.Administration.Setup.Http]::HttpTerminate([Microsoft.IIS.Administration.Setup.Http]::HTTP_INITIALIZE_CONFIG, [System.IntPtr]::Zero) -} - -function Add-SslBinding($_ipEndpoint, $_certificate, $_appId) { - if ($_ipEndpoint -eq $null) { - throw "Ip Endpoint required." - } - - if ($_certificate -eq $null) { - throw "Certificate required." - } - - if ($appId -eq $null) { - throw "App id required." - } - - <# FYI, [System.Guid]::Parse() is not supported in lower version of powershell - if (-not($_appId -is [System.Guid])) { - $_appId = [System.Guid]::Parse($_appId) - } - #> - - setSslConfiguration $_ipEndpoint $_certificate $_appId -} - -function Delete-SslBinding($_ipEndpoint) { - - if ($_ipEndpoint -eq $null) { - throw "Ip Endpoint required." - } - - setSslConfiguration $_ipEndpoint $null $([System.Guid]::Empty) -} - -function Get-SslBinding($_ipEndpoint) { - - if ($_ipEndpoint -eq $null) { - throw "Ip Endpoint required." - } - - $bufferSize = 4096 - try { - InitializeHttpSys| Out-Null - - $ipBytes = [System.Byte[]]$(GetIpEndpointBytes($_ipEndpoint)) - $hIp = [System.Runtime.InteropServices.GCHandle]::Alloc($ipBytes, [System.Runtime.InteropServices.GCHandleType]::Pinned) - $pIp = $hIp.AddrOfPinnedObject() - - $queryParam = New-Object "Microsoft.IIS.Administration.Setup.HTTP_SERVICE_CONFIG_SSL_QUERY" - $queryParam.QueryDesc = [Microsoft.IIS.Administration.Setup.HTTP_SERVICE_CONFIG_QUERY_TYPE]::HttpServiceConfigQueryExact - $queryParam.dwToken = 0 - $queryParam.KeyDesc = $pIp - - $returnLen = 0 - $pReturnSet = [System.Runtime.InteropServices.Marshal]::AllocHGlobal($bufferSize) - - $result = [Microsoft.IIS.Administration.Setup.Http]::HttpQueryServiceConfiguration( - [System.IntPtr]::Zero, - [Microsoft.IIS.Administration.Setup.HTTP_SERVICE_CONFIG_ID]::HttpServiceConfigSSLCertInfo, - [ref] $queryParam, - [uint32]([System.Runtime.InteropServices.Marshal]::SizeOf($queryParam)), - $pReturnSet, - $bufferSize, - [ref] $returnLen, - [System.IntPtr]::Zero) - - if ($result -eq 2) { - # File not found - return $null - } - if ($result -ne $SUCCESS) { - Write-Warning "Error reading Ssl Cert Configuration" - throw [System.ComponentModel.Win32Exception] $([System.int32]$result) - } - $sslConfig = [Microsoft.IIS.Administration.Setup.Http]::MarshalConfigSslSet($pReturnSet) - return GetBindingInfo $sslConfig - } - finally { - if ($hIp -ne $null) { - $hIp.Free() - $hIp = $null - } - if ($pReturnSet -ne [System.IntPtr]::Zero) { - [System.Runtime.InteropServices.Marshal]::FreeHGlobal($pReturnSet) - $pReturnSet = [System.IntPtr]::Zero - } - TerminateHttpSys | Out-Null - } -} - -function setSslConfiguration($_ipEndpoint, $_certificate, $_appId) { - - try { - InitializeHttpSys| Out-Null - - $sslSet = New-Object "Microsoft.IIS.Administration.Setup.HTTP_SERVICE_CONFIG_SSL_SET" - $sslSetSize = [System.Runtime.InteropServices.Marshal]::SizeOf($sslSet) - - $ipBytes = [System.Byte[]]$(GetIpEndpointBytes($_ipEndpoint)) - $hIp = [System.Runtime.InteropServices.GCHandle]::Alloc($ipBytes, [System.Runtime.InteropServices.GCHandleType]::Pinned) - $pIp = $hIp.AddrOfPinnedObject() - - $sslSet.KeyDesc = $pIp # IntPtr - $sslSet.SslHashLength = 0 - $sslSet.pSslHash = [System.IntPtr]::Zero - $sslSet.pSslCertStoreName = [System.IntPtr]::Zero - $sslSet.AppId = $_appId - - if ($_certificate -ne $null) { - # Create binding - - $certBytes = $_certificate.GetCertHash() - $hCertBytes = [System.Runtime.InteropServices.GCHandle]::Alloc($certBytes, [System.Runtime.InteropServices.GCHandleType]::Pinned) - $pCertBytes = $hCertBytes.AddrOfPinnedObject() - - $sslSet.SslHashLength = 20 - $sslSet.pSslHash = $pCertBytes - $sslSet.pSslCertStoreName = $StoreName - - $result = [Microsoft.IIS.Administration.Setup.Http]::HttpSetServiceConfiguration([System.IntPtr]::Zero, - [Microsoft.IIS.Administration.Setup.Http]::HTTP_SERVICE_CONFIG_SSLCERT_INFO, - [ref]$sslSet, - $sslSetSize, - [System.IntPtr]::Zero) - } - else { - #Delete binding - $result = [Microsoft.IIS.Administration.Setup.Http]::HttpDeleteServiceConfiguration([System.IntPtr]::Zero, - [Microsoft.IIS.Administration.Setup.Http]::HTTP_SERVICE_CONFIG_SSLCERT_INFO, - [ref]$sslSet, - $sslSetSize, - [System.IntPtr]::Zero) - } - - if ($result -ne $SUCCESS) { - Write-Warning "Error setting Ssl Cert Configuration" - throw [System.ComponentModel.Win32Exception] $([System.int32]$result) - } - } - finally { - if ($hIp -ne $null) { - $hIp.Free() - $hIp = $null - } - if ($hCertBytes -ne $null) { - $hCertBytes.Free() - $hCertBytes = $null - } - TerminateHttpSys| Out-Null - } -} - -InitializeInterop -switch ($Command) -{ - "Add-SslBinding" - { - return Add-SslBinding $IpEndPoint $Certificate $AppId - } - "Delete-SslBinding" - { - return Delete-SslBinding $IpEndpoint - } - "Get-SslBinding" - { - return Get-SslBinding $IpEndpoint - } - default - { - throw "Unknown command" - } -} \ No newline at end of file diff --git a/src/Servers/IIS/tools/installancm.ps1 b/src/Servers/IIS/tools/installancm.ps1 deleted file mode 100644 index b54a830d0e..0000000000 --- a/src/Servers/IIS/tools/installancm.ps1 +++ /dev/null @@ -1,471 +0,0 @@ -<# -.SYNOPSIS - Installs asnetcore to IISExpress and IIS directory -.DESCRIPTION - Installs asnetcore to IISExpress and IIS directory -.PARAMETER Rollback - Default: $false - Rollback the updated files with the original files -.PARAMETER ForceToBackup - Default: $false - Force to do the initial backup again (this parameter is meaningful only when you want to replace the existing backup file) -.PARAMETER Extract - Default: $false - Search ANCM nugetfile and extract the file to the path of the ExtractFilesTo parameter value -.PARAMETER PackagePath - Default: $PSScriptRoot\..\..\artifacts - Root path where ANCM nuget package is placed -.PARAMETER ExtractFilesTo - Default: $PSScriptRoot\..\..\artifacts" - Output path where aspentcore.dll file is extracted - -Example: - .\installancm.ps1 "C:\Users\jhkim\AppData\Local\Temp\ihvufnf1.atw\ancm\Debug" - -#> -[cmdletbinding()] -param( - [Parameter(Mandatory=$false, Position = 0)] - [string] $ExtractFilesTo="$PSScriptRoot\..\artifacts\build\AspNetCore\bin\Debug", - [Parameter(Mandatory=$false, Position = 1)] - [string] $PackagePath="$PSScriptRoot\..\artifacts\build", - [Parameter(Mandatory=$false)] - [switch] $Rollback=$false, - [Parameter(Mandatory=$false)] - [switch] $ForceToBackup=$false, - [Parameter(Mandatory=$false)] - [switch] $Extract=$false -) - -function Get-ANCMNugetFilePath() { - - $NugetFilePath = Get-ChildItem $PackagePath -Recurse -Filter Microsoft.AspNetCore.AspNetCoreModule*.nupkg | Select-Object -Last 1 - return ($NugetFilePath.FullName) -} - -function Check-TargetFiles() { - $functionName = "Check-TargetFiles" - $LogHeader = "[$ScriptFileName::$functionName]" - $result = $true - - if (-not $isIISExpressInstalled -and -not $isIISInstalled) - { - Say ("$LogHeader Both IIS and IISExpress does not have aspnetcore.dll file") - $result = $false - } - - if ($isIISExpressInstalled) - { - if (-not (Test-Path $aspnetCorex64To)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCorex64To") - $result = $false - } - if (-not (Test-Path $aspnetCoreSchemax64To)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreSchemax64To") - $result = $false - } - if ($is64BitMachine) - { - if (-not (Test-Path $aspnetCoreWin32To)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreWin32To") - $result = $false - } - if (-not (Test-Path $aspnetCoreSchemaWin32To)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreSchemaWin32To") - $result = $false - } - } - } - - if ($isIISInstalled) - { - if (-not (Test-Path $aspnetCorex64IISTo)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCorex64IISTo") - $result = $false - } - if (-not (Test-Path $aspnetCoreSchemax64IISTo)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreSchemax64IISTo") - $result = $false - } - if ($is64BitMachine) - { - if (-not (Test-Path $aspnetCoreWin32IISTo)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreWin32IISTo") - $result = $false - } - } - } - - return $result -} - -function Check-ExtractedFiles() { - $functionName = "Check-ExtractedFiles" - $LogHeader = "[$ScriptFileName::$functionName]" - $result = $true - - if (-not (Test-Path $aspnetCorex64From)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCorex64From") - $result = $false - } - if (-not (Test-Path $aspnetCoreWin32From)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreWin32From") - $result = $false - } - if (-not (Test-Path $aspnetCoreSchemax64From)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreSchemax64From") - $result = $false - } - if (-not (Test-Path $aspnetCoreSchemaWin32From)) - { - Say ("$LogHeader Error!!! Failed to find the file $aspnetCoreSchemaWin32From") - $result = $false - } - return $result -} - -function Extract-ANCMFromNugetPackage() { - $result = $true - - $functionName = "Extract-ANCMFromNugetPackage" - $LogHeader = "[$ScriptFileName::$functionName]" - - $backupAncmNugetFilePath = Join-Path $TempExtractFilesTo (get-item $ancmNugetFilePath).Name - if (Test-Path $backupAncmNugetFilePath) - { - Say ("$LogHeader Found backup file at $backupAncmNugetFilePath") - if ((get-item $ancmNugetFilePath).LastWriteTime -eq (get-item $backupAncmNugetFilePath).LastWriteTime) - { - if (Check-ExtractedFiles) - { - Say ("$LogHeader Skip to extract ANCM files because $ancmNugetFilePath is matched to the backup file $backupAncmNugetFilePath.") - return $result - } - } - } - - Add-Type -Assembly System.IO.Compression.FileSystem - if (Test-Path $TempExtractFilesTo) - { - remove-item $TempExtractFilesTo -Force -Recurse -Confirm:$false | out-null - } - if (Test-Path $TempExtractFilesTo) - { - Say ("$LogHeader Error!!! Failed to delete $TempExtractFilesTo") - $result = $false - return $result - } - else - { - new-item -Type directory $TempExtractFilesTo | out-null - } - if (-not (Test-Path $TempExtractFilesTo)) - { - Say ("$LogHeader Error!!! Failed to create $TempExtractFilesTo") - $result = $false - return $result - } - - # - Say ("$LogHeader Extract the ancm nuget file $ancmNugetFilePath to $TempExtractFilesTo ...") - [System.IO.Compression.ZipFile]::ExtractToDirectory($ancmNugetFilePath, $TempExtractFilesTo) - - Say ("$LogHeader Create the backup file of the nuget file to $backupAncmNugetFilePath") - copy-item $ancmNugetFilePath $backupAncmNugetFilePath - - return $result -} - -function Update-ANCM() { - - $functionName = "Update-ANCM -Rollback:$" + $Rollback.ToString() - $LogHeader = "[$ScriptFileName::$functionName]" - - if ($isIISExpressInstalled) - { - if ($is64BitMachine) - { - Say ("$LogHeader Start updating ANCM files for IISExpress for amd64 machine...") - Update-File $aspnetCorex64From $aspnetCorex64To - Update-File $aspnetCoreWin32From $aspnetCoreWin32To - Update-File $aspnetCoreSchemax64From $aspnetCoreSchemax64To - Update-File $aspnetCoreSchemaWin32From $aspnetCoreSchemaWin32To - } - else - { - Say ("$LogHeader Start updating ANCM files for IISExpress for x86 machine...") - Update-File $aspnetCoreWin32From $aspnetCorex64To - Update-File $aspnetCoreSchemaWin32From $aspnetCoreSchemax64To - } - } - else - { - Say ("$LogHeader Can't find aspnetcore.dll for IISExpress. Skipping updating ANCM files for IISExpress") - } - - if ($isIISInstalled) - { - if ($is64BitMachine) - { - Say ("$LogHeader Start updating ANCM files for IIS for amd64 machine...") - Update-File $aspnetCorex64From $aspnetCorex64IISTo - Update-File $aspnetCoreWin32From $aspnetCoreWin32IISTo - Update-File $aspnetCoreSchemax64From $aspnetCoreSchemax64IISTo - } - else - { - Say ("$LogHeader Start updating ANCM files for IIS for x86 machine...") - Update-File $aspnetCoreWin32IISFrom $aspnetCorex64IISTo - Update-File $aspnetCoreSchemaWin32From $aspnetCoreSchemax64IISTo - } - } - else - { - Say ("$LogHeader Can't find aspnetcore.dll for IIS. Skipping updating ANCM files for IIS server") - } -} - -function Update-File([string]$SourceFilePath, [string]$DestinationFilePath) { - - $Source = $SourceFilePath - $Destination = $DestinationFilePath - - $BackupFilePath = $Destination + ".ancm_backup" - if ($Rollback) - { - $Source = $BackupFilePath - } - - $functionName = "Update-File -Rollback:$" + $Rollback.ToString() - $LogHeader = "[$ScriptFileName::$functionName]" - - if ($ForceToBackup) - { - if (Test-Path $BackupFilePath) - { - $backupFileRemoved = $false - if ( ((get-item $DestinationFilePath).CreationTime -gt (get-item $BackupFilePath).CreationTime) -and ((get-item $DestinationFilePath).CreationTime -gt (get-item $SourceFilePath).CreationTime) ) - { - $backupFileRemoved = $true - Say (' Delete the existing "$BackupFilePath" because "$DestinationFilePath" is newer than both "$BackupFilePath" and "$SourceFilePath"') - Remove-Item $BackupFilePath -Force -Confirm:$false - } - else - { - Say-Verbose (' Skipping to delete the existing backupfile because "$DestinationFilePath" is not newer than $BackupFilePath"') - } - } - if ($backupFileRemoved -and (Test-Path $BackupFilePath)) - { - throw ("$LogHeader Can't delete $BackupFilePath") - } - } - - # Do the initial back up before updating file - if (-Not (Test-Path $BackupFilePath)) - { - Say (" Create a backup $BackupFilePath") - Copy-Item $Destination $BackupFilePath -Force - - $fileMatched = $null -eq (Compare-Object -ReferenceObject $(Get-Content $Destination) -DifferenceObject $(Get-Content $BackupFilePath)) - if (-not $fileMatched) - { - throw ("$LogHeader File not matched!!! $Destination $BackupFilePath") - } - } - if (-Not (Test-Path $BackupFilePath)) - { - throw ("$LogHeader Can't backup $Source to $BackupFilePath") - } - - # Copy file from Source to Destination if those files are different each other - if (-Not (Test-Path $Destination)) - { - throw ("$LogHeader Can't find $Destination") - } - $fileMatched = $null -eq (Compare-Object -ReferenceObject $(Get-Content $Source) -DifferenceObject $(Get-Content $Destination)) - if (-not $fileMatched) - { - Say (" Copying $Source to $Desting...") - Copy-Item $Source $Destination -Force - - # check file is correctly copied - $fileMatched = $null -eq (Compare-Object -ReferenceObject $(Get-Content $Source) -DifferenceObject $(Get-Content $Destination)) - if (-not $fileMatched) - { - throw ("$LogHeader File not matched!!! $Source $Destination") - } - else - { - Say-Verbose ("$LogHeader File matched!!! $Source to $Destination") - } - } - else - { - Say (" Skipping $Destination that is already identical to $Source ") - } -} - -function Say($str) { - Write-Host $str -} - -function Say-Verbose($str) { - Write-Verbose $str -} - -####################################################### -# Start execution point -####################################################### - -$EXIT_FAIL = 1 -$EXIT_SUCCESS = 0 - -$ScriptFileName = "installancm.ps1" -$LogHeader = "[$ScriptFileName]" - -if ($Extract -and (-Not $Rollback)) -{ - if (-not (Test-Path $PackagePath)) - { - Say ("$LogHeader Error!!! Failed to find the directory $PackagePath") - exit $EXIT_FAIL - } - - $ancmNugetFilePath = Get-ANCMNugetFilePath - if (-not (Test-Path $ancmNugetFilePath)) - { - Say ("$LogHeader Error!!! Failed to find AspNetCoreModule nupkg file under $PackagePath nor its child directories") - exit $EXIT_FAIL - } -} - -if (-Not $Rollback) -{ - if (-not (Test-Path $ExtractFilesTo)) - { - Say ("$LogHeader Error!!! Failed to find the directory $ExtractFilesTo") - exit $EXIT_FAIL - } -} - -$TempExtractFilesTo = $ExtractFilesTo + "\.ancm" -$ExtractFilesRootPath = "" -if ($Extract) -{ - $ExtractFilesRootPath = $TempExtractFilesTo + "\ancm\Debug" -} -else -{ - $ExtractFilesRootPath = $ExtractFilesTo -} - -# Try with solution output path -$aspnetCorex64From = $ExtractFilesRootPath + "\x64\aspnetcore.dll" -$aspnetCoreWin32From = $ExtractFilesRootPath + "\Win32\aspnetcore.dll" -$aspnetCoreSchemax64From = $ExtractFilesRootPath + "\x64\aspnetcore_schema.xml" -$aspnetCoreSchemaWin32From = $ExtractFilesRootPath + "\Win32\aspnetcore_schema.xml" - -$aspnetCorex64To = "$env:ProgramFiles\IIS Express\aspnetcore.dll" -$aspnetCoreWin32To = "${env:ProgramFiles(x86)}\IIS Express\aspnetcore.dll" -$aspnetCoreSchemax64To = "$env:ProgramFiles\IIS Express\config\schema\aspnetcore_schema.xml" -$aspnetCoreSchemaWin32To = "${env:ProgramFiles(x86)}\IIS Express\config\schema\aspnetcore_schema.xml" - -$aspnetCorex64IISTo = "$env:windir\system32\inetsrv\aspnetcore.dll" -$aspnetCoreWin32IISTo = "$env:windir\syswow64\inetsrv\aspnetcore.dll" -$aspnetCoreSchemax64IISTo = "$env:windir\system32\inetsrv\config\schema\aspnetcore_schema.xml" - -# if this is not solution output path, use nuget package directory structure -if (-not (Test-Path $aspnetCorex64From)) -{ - $aspnetCorex64From = $ExtractFilesRootPath + "\runtimes\win7-x64\native\aspnetcore.dll" - $aspnetCoreWin32From = $ExtractFilesRootPath + "\runtimes\win7-x86\native\aspnetcore.dll" - $aspnetCoreSchemax64From = $ExtractFilesRootPath + "\aspnetcore_schema.xml" - $aspnetCoreSchemaWin32From = $ExtractFilesRootPath + "\aspnetcore_schema.xml" - - $aspnetCorex64To = "$env:ProgramFiles\IIS Express\aspnetcore.dll" - $aspnetCoreWin32To = "${env:ProgramFiles(x86)}\IIS Express\aspnetcore.dll" - $aspnetCoreSchemax64To = "$env:ProgramFiles\IIS Express\config\schema\aspnetcore_schema.xml" - $aspnetCoreSchemaWin32To = "${env:ProgramFiles(x86)}\IIS Express\config\schema\aspnetcore_schema.xml" - - $aspnetCorex64IISTo = "$env:windir\system32\inetsrv\aspnetcore.dll" - $aspnetCoreWin32IISTo = "$env:windir\syswow64\inetsrv\aspnetcore.dll" - $aspnetCoreSchemax64IISTo = "$env:windir\system32\inetsrv\config\schema\aspnetcore_schema.xml" -} - -$is64BitMachine = $env:PROCESSOR_ARCHITECTURE.ToLower() -eq "amd64" -$isIISExpressInstalled = Test-Path $aspnetCorex64To -$isIISInstalled = Test-Path $aspnetCorex64IISTo - -# Check expected files are available on IIS/IISExpress directory -if (-not (Check-TargetFiles)) -{ - Say ("$LogHeader Error!!! Failed to update ANCM files because AspnetCore.dll is not installed on IIS/IISExpress directory.") - exit $EXIT_FAIL -} - -if ($Extract) -{ - # Extrack nuget package when $DoExtract is true - if (-not (Extract-ANCMFromNugetPackage)) - { - Say ("$LogHeader Error!!! Failed to extract ANCM file") - exit $EXIT_FAIL - } -} - -# clean up IIS and IISExpress worker processes and IIS services -Say ("$LogHeader Stopping w3wp.exe process") -Stop-Process -Name w3wp -ErrorAction Ignore -Force -Confirm:$false - -Say ("$LogHeader Stopping iisexpress.exe process") -Stop-Process -Name iisexpress -ErrorAction Ignore -Force -Confirm:$false - -$w3svcGotStopped = $false -$w3svcWindowsServce = Get-Service W3SVC -ErrorAction Ignore -if ($w3svcWindowsServce -and $w3svcWindowsServce.Status -eq "Running") -{ - Say ("$LogHeader Stopping w3svc service") - $w3svcGotStopped = $true - Stop-Service W3SVC -Force -ErrorAction Ignore - Say ("$LogHeader Stopping w3logsvc service") - Stop-Service W3LOGSVC -Force -ErrorAction Ignore -} - -if ($Rollback) -{ - Say ("$LogHeader Rolling back ANCM files...") -} -else -{ - Say ("Updating ANCM files...") -} -Update-ANCM - -# Recover w3svc service -if ($w3svcGotStopped) -{ - Say ("$LogHeader Starting w3svc service") - Start-Service W3SVC -ErrorAction Ignore - $w3svcServiceStopped = $false - - $w3svcWindowsServce = Get-Service W3SVC -ErrorAction Ignore - if ($w3svcWindowsServce.Status -ne "Running") - { - Say ("$LogHeader Error!!! Failed to start w3svc service.") - exit $EXIT_FAIL - } -} - -Say ("$LogHeader Finished!!!") -exit $EXIT_SUCCESS diff --git a/src/Servers/IIS/tools/stresstest.ps1 b/src/Servers/IIS/tools/stresstest.ps1 deleted file mode 100644 index 981c6fcf44..0000000000 --- a/src/Servers/IIS/tools/stresstest.ps1 +++ /dev/null @@ -1,96 +0,0 @@ -########################################################## -# NOTE: -# For running test automation, following prerequisite required: -# -# 1. On Win7, powershell should be upgraded to 4.0 -# https://social.technet.microsoft.com/wiki/contents/articles/21016.how-to-install-windows-powershell-4-0.aspx -# 2. url-rewrite should be installed -# 3. makecert.exe tools should be available -########################################################## - -# Replace aspnetcore.dll with the latest version -copy C:\gitroot\AspNetCoreModule\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.dll "C:\Program Files\IIS Express" -copy C:\gitroot\AspNetCoreModule\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.pdb "C:\Program Files\IIS Express" - - -# Enable appverif for IISExpress.exe -appverif /verify iisexpress.exe - -# Set the AspNetCoreModuleTest environment variable with the following command -cd C:\gitroot\AspNetCoreModule\test\AspNetCoreModule.Test -dotnet restore -dotnet build -$aspNetCoreModuleTest="C:\gitroot\AspNetCoreModule\test\AspNetCoreModule.Test\bin\Debug\net46" - -if (Test-Path (Join-Path $aspNetCoreModuleTest aspnetcoremodule.test.dll)) -{ - # Clean up applicationhost.config of IISExpress - del $env:userprofile\documents\iisexpress\config\applicationhost.config -Confirm:$false -Force - Start-Process "C:\Program Files\IIS Express\iisexpress.exe" - Sleep 3 - Stop-Process -Name iisexpress - - # Create sites - (1..50) | foreach { md ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) 2> out-null } - (1..50) | foreach { copy C:\gitroot\AspNetCoreModule\test\StressTestWebRoot\web.config ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) } - (1..50) | foreach { - $path = ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) - $appPath = "/foo"+$_ - & "C:\Program Files\IIS Express\appcmd.exe" add app /site.name:"WebSite1" /path:$appPath /physicalPath:$path - } - - <#(1..50) | foreach { - $configpath = ("WebSite1/foo" + $_) - $value = "C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ + ".exe" - & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /processPath:$value - } - (1..50) | foreach { copy C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo.exe ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ +".exe") } - (1..50) | foreach { - $configpath = ("WebSite1/foo" + $_) - $value = "%AspNetCoreModuleTest%\AspnetCoreApp_HelloWeb\foo" + $_ + ".exe" - & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /processPath:$value /apphostconfig:%AspNetCoreModuleTest%\config\applicationhost.config - - $value = "%AspNetCoreModuleTest%\AspnetCoreApp_HelloWeb\AutobahnTestServer.dll" - & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /arguments:$value /apphostconfig:%AspNetCoreModuleTest%\config\applicationhost.config - } - #> - - # Start IISExpress with running the below command - &"C:\Program Files\Debugging Tools for Windows (x64)\windbg.exe" /g /G "C:\Program Files\IIS Express\iisexpress.exe" - - - # 6. Start stress testing - (1..10000) | foreach { - if ($_ % 2 -eq 0) - { - ("Recycling backend only") - stop-process -name dotnet - (1..50) | foreach { del ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ + "\app_offline.htm") -confirm:$false -Force 2> out-null } - stop-process -name dotnet - } - else - { - ("Recycling backedn + enabling appoffline ....") - stop-process -name dotnet - (1..50) | foreach { copy C:\gitroot\AspNetCoreModule\test\StressTestWebRoot\app_offline.htm ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) } - } - Sleep 1 - - (1..10) | foreach { - (1..50) | foreach { - invoke-webrequest ("http://localhost:8080/foo"+$_) > $null - } - } - } - - - # Stress test idea - # 1. Use Web Stress Tester - # 2. Run stop-process -name dotnet - # 3. Hit Q command to IISExpress console window - # 4. Use app_offline.htm - # 5. Save dummy web.config -} - -// bp aspnetcore!FORWARDING_HANDLER::FORWARDING_HANDLER -// bp aspnetcore!FORWARDING_HANDLER::~FORWARDING_HANDLER \ No newline at end of file From f1b125d69f29fc2fa3ff7b38add95a20a4b5e594 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 21 Dec 2018 11:02:18 -0800 Subject: [PATCH 09/80] Restore IISIntegration Unit test project (#6068) --- src/Servers/IIS/IISIntegration.NoV1.sln | 130 +++--- .../IISIntegration.Tests/IISExtensionTests.cs | 33 ++ .../IISMiddlewareTests.cs | 420 ++++++++++++++++++ ...NetCore.Server.IISIntegration.Tests.csproj | 17 + 4 files changed, 524 insertions(+), 76 deletions(-) create mode 100644 src/Servers/IIS/test/IISIntegration.Tests/IISExtensionTests.cs create mode 100644 src/Servers/IIS/test/IISIntegration.Tests/IISMiddlewareTests.cs create mode 100644 src/Servers/IIS/test/IISIntegration.Tests/MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj diff --git a/src/Servers/IIS/IISIntegration.NoV1.sln b/src/Servers/IIS/IISIntegration.NoV1.sln index 1200436098..43cbf1fc02 100644 --- a/src/Servers/IIS/IISIntegration.NoV1.sln +++ b/src/Servers/IIS/IISIntegration.NoV1.sln @@ -30,8 +30,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E-9CC8-450C-8A8D-94FC76428150}" ProjectSection(SolutionItems) = preProject build\applicationhost.config = build\applicationhost.config @@ -54,8 +52,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "samples\NativeIISSample\NativeIISSample.csproj", "{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\WebSites\InProcessWebSite\InProcessWebSite.csproj", "{679FA2A2-898B-4320-884E-C2D294A97CE1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}" ProjectSection(ProjectDependencies) = postProject {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} @@ -64,11 +60,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server {D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "test\WebSites\StressTestWebSite\StressTestWebSite.csproj", "{13FD8F12-FFBE-4D01-B4AC-444F2994B04F}" - ProjectSection(ProjectDependencies) = postProject - {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}" @@ -81,8 +72,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\AspNetCore EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\WebSites\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{42E60F88-E23F-417A-8143-0CCEC05E1D02}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{622D35C9-627B-466E-8D15-752968CC79AF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}" @@ -113,10 +102,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.ForwardsCompatibility.FunctionalTests", "test\IIS.ForwardsCompatibility.FunctionalTests\IIS.ForwardsCompatibility.FunctionalTests.csproj", "{D1EA5D99-28FD-4197-81DE-17098846B38B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\WebSites\InProcessForwardsCompatWebSite\InProcessWebSite.csproj", "{BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "test\testassets\TestTasks\TestTasks.csproj", "{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\testassets\InProcessWebSite\InProcessWebSite.csproj", "{E685D546-FDCD-4A4C-9183-728C308A9A9E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "test\testassets\StressTestWebSite\StressTestWebSite.csproj", "{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MIcrosoft.AspNetCore.Server.IISIntegration.Tests", "test\IISIntegration.Tests\MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{ACCF17D6-CEA0-4008-8F36-70085163CAE7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -151,18 +146,6 @@ Global {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.Build.0 = Release|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.ActiveCfg = Release|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.Build.0 = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.ActiveCfg = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.Build.0 = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.ActiveCfg = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.Build.0 = Debug|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.Build.0 = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.ActiveCfg = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.Build.0 = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.ActiveCfg = Release|Any CPU - {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.Build.0 = Release|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -187,18 +170,6 @@ Global {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.Build.0 = Release|x64 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.ActiveCfg = Release|x86 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.Build.0 = Release|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.ActiveCfg = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.Build.0 = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.ActiveCfg = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.Build.0 = Debug|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.ActiveCfg = Debug|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.Build.0 = Debug|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.ActiveCfg = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.Build.0 = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.ActiveCfg = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.Build.0 = Release|x64 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.ActiveCfg = Release|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.Build.0 = Release|x86 {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.Build.0 = Debug|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -211,18 +182,6 @@ Global {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.Build.0 = Release|Any CPU - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.ActiveCfg = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.Build.0 = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.ActiveCfg = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.Build.0 = Debug|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.ActiveCfg = Debug|x86 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.Build.0 = Debug|x86 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.ActiveCfg = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.Build.0 = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.ActiveCfg = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.Build.0 = Release|x64 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x86.ActiveCfg = Release|x86 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x86.Build.0 = Release|x86 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64 @@ -263,18 +222,6 @@ Global {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.Build.0 = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.ActiveCfg = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.Build.0 = Debug|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.ActiveCfg = Debug|x86 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.Build.0 = Debug|x86 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.ActiveCfg = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.Build.0 = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.ActiveCfg = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.Build.0 = Release|x64 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.ActiveCfg = Release|x86 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.Build.0 = Release|x86 {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -399,16 +346,6 @@ Global {D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x64.Build.0 = Release|Any CPU {D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x86.ActiveCfg = Release|Any CPU {D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x86.Build.0 = Release|Any CPU - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Debug|Any CPU.ActiveCfg = Debug|x86 - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Debug|x64.ActiveCfg = Debug|x64 - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Debug|x64.Build.0 = Debug|x64 - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Debug|x86.ActiveCfg = Debug|x86 - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Debug|x86.Build.0 = Debug|x86 - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Release|Any CPU.ActiveCfg = Release|x86 - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Release|x64.ActiveCfg = Release|x64 - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Release|x64.Build.0 = Release|x64 - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Release|x86.ActiveCfg = Release|x86 - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Release|x86.Build.0 = Release|x86 {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -421,6 +358,48 @@ Global {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x64.Build.0 = Release|Any CPU {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x86.ActiveCfg = Release|Any CPU {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x86.Build.0 = Release|Any CPU + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|Any CPU.ActiveCfg = Debug|x86 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x64.ActiveCfg = Debug|x64 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x64.Build.0 = Debug|x64 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x86.ActiveCfg = Debug|x86 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x86.Build.0 = Debug|x86 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|Any CPU.ActiveCfg = Release|x86 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x64.ActiveCfg = Release|x64 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x64.Build.0 = Release|x64 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x86.ActiveCfg = Release|x86 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x86.Build.0 = Release|x86 + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|Any CPU.ActiveCfg = Debug|x86 + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x64.ActiveCfg = Debug|x64 + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x64.Build.0 = Debug|x64 + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x86.ActiveCfg = Debug|x86 + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x86.Build.0 = Debug|x86 + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|Any CPU.ActiveCfg = Release|x86 + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x64.ActiveCfg = Release|x64 + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x64.Build.0 = Release|x64 + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x86.ActiveCfg = Release|x86 + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x86.Build.0 = Release|x86 + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|Any CPU.ActiveCfg = Debug|x86 + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x64.ActiveCfg = Debug|x64 + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x64.Build.0 = Debug|x64 + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x86.ActiveCfg = Debug|x86 + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x86.Build.0 = Debug|x86 + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|Any CPU.ActiveCfg = Release|x86 + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x64.ActiveCfg = Release|x64 + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x64.Build.0 = Release|x64 + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x86.ActiveCfg = Release|x86 + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x86.Build.0 = Release|x86 + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x64.ActiveCfg = Debug|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x64.Build.0 = Debug|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x86.ActiveCfg = Debug|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x86.Build.0 = Debug|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|Any CPU.Build.0 = Release|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x64.ActiveCfg = Release|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x64.Build.0 = Release|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x86.ActiveCfg = Release|Any CPU + {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -428,19 +407,15 @@ Global GlobalSection(NestedProjects) = preSolution {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9} {8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} - {4106DB10-E09F-480E-9CE6-B39235512EE6} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {9BC4AFCB-325D-4C81-8228-8CF301CE2F97} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9} - {679FA2A2-898B-4320-884E-C2D294A97CE1} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {46A8612B-418B-4D70-B3A7-A21DD0627473} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {06CA2C2B-83B0-4D83-905A-E0C74790009E} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {55494E58-E061-4C4C-A0A8-837008E72F85} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {42E60F88-E23F-417A-8143-0CCEC05E1D02} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF} {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} @@ -452,8 +427,11 @@ Global {D17B7B35-5361-4A50-B499-E03E5C3CC095} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {582B07BC-73F4-4689-8557-B039298BD82C} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {D1EA5D99-28FD-4197-81DE-17098846B38B} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {E685D546-FDCD-4A4C-9183-728C308A9A9E} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {ACCF17D6-CEA0-4008-8F36-70085163CAE7} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/src/Servers/IIS/test/IISIntegration.Tests/IISExtensionTests.cs b/src/Servers/IIS/test/IISIntegration.Tests/IISExtensionTests.cs new file mode 100644 index 0000000000..deae44471d --- /dev/null +++ b/src/Servers/IIS/test/IISIntegration.Tests/IISExtensionTests.cs @@ -0,0 +1,33 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Linq; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + public class IISExtensionTests + { + [Fact] + public void CallingUseIISIntegrationMultipleTimesWorks() + { + + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .UseIISIntegration() + .Configure(app => { }); + var server = new TestServer(builder); + + var filters = server.Host.Services.GetServices() + .OfType(); + + Assert.Single(filters); + } + } +} \ No newline at end of file diff --git a/src/Servers/IIS/test/IISIntegration.Tests/IISMiddlewareTests.cs b/src/Servers/IIS/test/IISIntegration.Tests/IISMiddlewareTests.cs new file mode 100644 index 0000000000..c5ef78b911 --- /dev/null +++ b/src/Servers/IIS/test/IISIntegration.Tests/IISMiddlewareTests.cs @@ -0,0 +1,420 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Net; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http.Features.Authentication; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + public class IISMiddlewareTests + { + [Fact] + public async Task MiddlewareSkippedIfTokenIsMissing() + { + var assertsExecuted = false; + + var builder = new WebHostBuilder() + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + app.Run(context => + { + var auth = context.Features.Get(); + Assert.Null(auth); + assertsExecuted = true; + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var req = new HttpRequestMessage(HttpMethod.Get, ""); + req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + var response = await server.CreateClient().SendAsync(req); + Assert.True(assertsExecuted); + response.EnsureSuccessStatusCode(); + } + + [Fact] + public async Task MiddlewareRejectsRequestIfTokenHeaderIsMissing() + { + var assertsExecuted = false; + + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + app.Run(context => + { + var auth = context.Features.Get(); + Assert.Null(auth); + assertsExecuted = true; + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var req = new HttpRequestMessage(HttpMethod.Get, ""); + var response = await server.CreateClient().SendAsync(req); + Assert.False(assertsExecuted); + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + } + + [Theory] + [InlineData("/", "/iisintegration", "shutdown")] + [InlineData("/", "/iisintegration", "Shutdown")] + [InlineData("/pathBase", "/pathBase/iisintegration", "shutdown")] + [InlineData("/pathBase", "/pathBase/iisintegration", "Shutdown")] + public async Task MiddlewareShutsdownGivenANCMShutdown(string pathBase, string requestPath, string shutdownEvent) + { + var requestExecuted = new ManualResetEvent(false); + var applicationStoppingFired = new ManualResetEvent(false); + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", pathBase) + .UseIISIntegration() + .Configure(app => + { + var appLifetime = app.ApplicationServices.GetRequiredService(); + appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); + + app.Run(context => + { + requestExecuted.Set(); + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var request = new HttpRequestMessage(HttpMethod.Post, requestPath); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", shutdownEvent); + var response = await server.CreateClient().SendAsync(request); + + Assert.True(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(5))); + Assert.False(requestExecuted.WaitOne(0)); + Assert.Equal(HttpStatusCode.Accepted, response.StatusCode); + } + + public static TheoryData InvalidShutdownMethods + { + get + { + return new TheoryData + { + HttpMethod.Put, + HttpMethod.Trace, + HttpMethod.Head, + HttpMethod.Get, + HttpMethod.Delete, + HttpMethod.Options + }; + } + } + + [Theory] + [MemberData(nameof(InvalidShutdownMethods))] + public async Task MiddlewareIgnoresShutdownGivenWrongMethod(HttpMethod method) + { + var requestExecuted = new ManualResetEvent(false); + var applicationStoppingFired = new ManualResetEvent(false); + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + var appLifetime = app.ApplicationServices.GetRequiredService(); + appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); + + app.Run(context => + { + requestExecuted.Set(); + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var request = new HttpRequestMessage(method, "/iisintegration"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", "shutdown"); + var response = await server.CreateClient().SendAsync(request); + + Assert.False(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(1))); + Assert.True(requestExecuted.WaitOne(0)); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Theory] + [InlineData("/")] + [InlineData("/path")] + [InlineData("/path/iisintegration")] + public async Task MiddlewareIgnoresShutdownGivenWrongPath(string path) + { + var requestExecuted = new ManualResetEvent(false); + var applicationStoppingFired = new ManualResetEvent(false); + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + var appLifetime = app.ApplicationServices.GetRequiredService(); + appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); + + app.Run(context => + { + requestExecuted.Set(); + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var request = new HttpRequestMessage(HttpMethod.Post, path); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", "shutdown"); + var response = await server.CreateClient().SendAsync(request); + + Assert.False(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(1))); + Assert.True(requestExecuted.WaitOne(0)); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Theory] + [InlineData("event")] + [InlineData("")] + [InlineData(null)] + public async Task MiddlewareIgnoresShutdownGivenWrongEvent(string shutdownEvent) + { + var requestExecuted = new ManualResetEvent(false); + var applicationStoppingFired = new ManualResetEvent(false); + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + var appLifetime = app.ApplicationServices.GetRequiredService(); + appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); + + app.Run(context => + { + requestExecuted.Set(); + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var request = new HttpRequestMessage(HttpMethod.Post, "/iisintegration"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", shutdownEvent); + var response = await server.CreateClient().SendAsync(request); + + Assert.False(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(1))); + Assert.True(requestExecuted.WaitOne(0)); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public void UrlDelayRegisteredAndPreferHostingUrlsSet() + { + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + app.Run(context => Task.FromResult(0)); + }); + + Assert.Null(builder.GetSetting(WebHostDefaults.ServerUrlsKey)); + Assert.Null(builder.GetSetting(WebHostDefaults.PreferHostingUrlsKey)); + + // Adds a server and calls Build() + var server = new TestServer(builder); + + Assert.Equal("http://127.0.0.1:12345", builder.GetSetting(WebHostDefaults.ServerUrlsKey)); + Assert.Equal("true", builder.GetSetting(WebHostDefaults.PreferHostingUrlsKey)); + } + + [Fact] + public void PathBaseHiddenFromServer() + { + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/pathBase") + .UseIISIntegration() + .Configure(app => + { + app.Run(context => Task.FromResult(0)); + }); + new TestServer(builder); + + Assert.Equal("http://127.0.0.1:12345", builder.GetSetting(WebHostDefaults.ServerUrlsKey)); + } + + [Fact] + public async Task AddsUsePathBaseMiddlewareWhenPathBaseSpecified() + { + var requestPathBase = string.Empty; + var requestPath = string.Empty; + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/pathbase") + .UseIISIntegration() + .Configure(app => + { + app.Run(context => + { + requestPathBase = context.Request.PathBase.Value; + requestPath = context.Request.Path.Value; + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var request = new HttpRequestMessage(HttpMethod.Get, "/PathBase/Path"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + var response = await server.CreateClient().SendAsync(request); + + Assert.Equal("/PathBase", requestPathBase); + Assert.Equal("/Path", requestPath); + } + + [Fact] + public async Task AddsAuthenticationHandlerByDefault() + { + var assertsExecuted = false; + + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + app.Run(async context => + { + var auth = context.RequestServices.GetRequiredService(); + var windows = await auth.GetSchemeAsync(IISDefaults.AuthenticationScheme); + Assert.NotNull(windows); + Assert.Null(windows.DisplayName); + Assert.Equal("Microsoft.AspNetCore.Server.IISIntegration.AuthenticationHandler", windows.HandlerType.FullName); + assertsExecuted = true; + }); + }); + var server = new TestServer(builder); + + var req = new HttpRequestMessage(HttpMethod.Get, ""); + req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + await server.CreateClient().SendAsync(req); + + Assert.True(assertsExecuted); + } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public async Task OnlyAddAuthenticationHandlerIfForwardWindowsAuthentication(bool forward) + { + var assertsExecuted = false; + + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .ConfigureServices(services => + { + services.Configure(options => + { + options.ForwardWindowsAuthentication = forward; + }); + }) + .Configure(app => + { + app.Run(async context => + { + var auth = context.RequestServices.GetService(); + Assert.NotNull(auth); + var windowsAuth = await auth.GetSchemeAsync(IISDefaults.AuthenticationScheme); + if (forward) + { + Assert.NotNull(windowsAuth); + Assert.Null(windowsAuth.DisplayName); + Assert.Equal("AuthenticationHandler", windowsAuth.HandlerType.Name); + } + else + { + Assert.Null(windowsAuth); + } + assertsExecuted = true; + }); + }); + var server = new TestServer(builder); + + var req = new HttpRequestMessage(HttpMethod.Get, ""); + req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + await server.CreateClient().SendAsync(req); + + Assert.True(assertsExecuted); + } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public async Task DoesNotBlowUpWithoutAuth(bool forward) + { + var assertsExecuted = false; + + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .ConfigureServices(services => + { + services.Configure(options => + { + options.ForwardWindowsAuthentication = forward; + }); + }) + .Configure(app => + { + app.Run(context => + { + assertsExecuted = true; + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var req = new HttpRequestMessage(HttpMethod.Get, ""); + req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + await server.CreateClient().SendAsync(req); + + Assert.True(assertsExecuted); + } + } +} \ No newline at end of file diff --git a/src/Servers/IIS/test/IISIntegration.Tests/MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/Servers/IIS/test/IISIntegration.Tests/MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj new file mode 100644 index 0000000000..85d670991c --- /dev/null +++ b/src/Servers/IIS/test/IISIntegration.Tests/MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj @@ -0,0 +1,17 @@ + + + + + $(StandardTestTfms) + + + + + + + + + + + + \ No newline at end of file From 3641761d182ac7b50c100d641196c51cc2d78858 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 21 Dec 2018 11:43:09 -0800 Subject: [PATCH 10/80] Convert AADIntegration projects to ProjectRef (#6082) --- Directory.Build.targets | 3 + build/buildorder.props | 1 - build/repo.props | 89 ++-- build/submodules.props | 1 - eng/Baseline.Designer.props | 166 ++++--- eng/Baseline.xml | 16 +- eng/Dependencies.props | 1 + eng/ProjectReferences.props | 13 +- eng/targets/ResolveReferences.targets | 2 +- run.ps1 | 9 + src/AADIntegration/.editorconfig | 56 --- src/AADIntegration/.gitignore | 43 -- src/AADIntegration/AADIntegration.sln | 79 --- src/AADIntegration/Directory.Build.props | 21 - src/AADIntegration/Directory.Build.targets | 7 - src/AADIntegration/NuGetPackageVerifier.json | 23 - src/AADIntegration/README.md | 14 - src/AADIntegration/Settings.StyleCop | 455 ------------------ src/AADIntegration/build/dependencies.props | 47 -- src/AADIntegration/build/repo.props | 8 - src/AADIntegration/build/sources.props | 17 - .../AzureADB2CSample/AzureADB2CSample.csproj | 27 -- .../Properties/launchSettings.json | 27 -- src/AADIntegration/src/Directory.Build.props | 7 - src/AADIntegration/test/Directory.Build.props | 25 - ...hentication.AzureAD.FunctionalTests.csproj | 21 - .../AzureAD.WebSite/AzureAD.WebSite.csproj | 28 -- .../test/WebSites/Directory.Build.props | 11 - src/AADIntegration/version.props | 12 - src/Azure/Azure.sln | 284 +++++++++++ .../AzureAD/Controllers/AccountController.cs | 0 .../AzureAD/Pages/Account/AccessDenied.cshtml | 0 .../Pages/Account/AccessDenied.cshtml.cs | 0 .../Areas/AzureAD/Pages/Account/Error.cshtml | 0 .../AzureAD/Pages/Account/Error.cshtml.cs | 0 .../AzureAD/Pages/Account/SignedOut.cshtml | 0 .../AzureAD/Pages/Account/SignedOut.cshtml.cs | 0 .../AzureAD/Pages/Account/_viewImports.cshtml | 0 .../Areas/AzureAD/Pages/_ViewStart.cshtml | 0 ...AzureADAccountControllerFeatureProvider.cs | 0 .../AzureADAuthenticationBuilderExtensions.cs | 0 .../src}/AzureADDefaults.cs | 0 .../src}/AzureADOptions.cs | 0 .../src}/AzureADOptionsConfiguration.cs | 0 .../src}/AzureADSchemeOptions.cs | 0 .../src}/CookieOptionsConfiguration.cs | 0 .../src}/JwtBearerOptionsConfiguration.cs | 0 ...spNetCore.Authentication.AzureAD.UI.csproj | 13 +- .../src}/OpenIdConnectOptionsConfiguration.cs | 0 .../src}/Properties/AssemblyInfo.cs | 0 .../src}/baseline.netcore.json | 0 ...eADAuthenticationBuilderExtensionsTests.cs | 0 .../Controllers/AccountControllerTests.cs | 0 ...Core.Authentication.AzureAD.UI.Test.csproj | 4 +- .../test}/xunit.runner.json | 0 .../Controllers/AccountController.cs | 0 .../Pages/Account/AccessDenied.cshtml | 0 .../Pages/Account/AccessDenied.cshtml.cs | 0 .../AzureADB2C/Pages/Account/Error.cshtml | 0 .../AzureADB2C/Pages/Account/Error.cshtml.cs | 0 .../AzureADB2C/Pages/Account/SignedOut.cshtml | 0 .../Pages/Account/SignedOut.cshtml.cs | 0 .../Pages/Account/_viewImports.cshtml | 0 .../Areas/AzureADB2C/Pages/_ViewStart.cshtml | 0 ...reADB2CAccountControllerFeatureProvider.cs | 0 ...ureAdB2CAuthenticationBuilderExtensions.cs | 0 .../src}/AzureAdB2CDefaults.cs | 0 .../AzureAdB2COpenIDConnectEventHandlers.cs | 0 .../src}/AzureAdB2COptions.cs | 0 .../src}/AzureAdB2COptionsConfiguration.cs | 0 .../src}/AzureAdB2CSchemeOptions.cs | 0 .../src}/CookieOptionsConfiguration.cs | 0 .../src}/JwtBearerOptionsConfiguration.cs | 0 ...etCore.Authentication.AzureADB2C.UI.csproj | 13 +- .../src}/OpenIdConnectOptionsConfiguration.cs | 0 .../src}/Properties/AssemblyInfo.cs | 0 .../src}/baseline.netcore.json | 0 ...B2CAuthenticationBuilderExtensionsTests.cs | 0 ...ureAdB2COpenIDConnectEventHandlersTests.cs | 0 .../Controllers/AccountControllerTests.cs | 0 ...e.Authentication.AzureADB2C.UI.Test.csproj | 4 +- .../test}/xunit.runner.json | 0 .../AzureAD/AzureAD.ruleset} | 4 +- src/Azure/AzureAD/Directory.Build.props | 8 + src/Azure/AzureAD/README.md | 4 + .../AzureADB2CSample/AzureADB2CSample.csproj | 22 + .../AzureADB2CSample/Pages/Index.cshtml | 0 .../AzureADB2CSample/Pages/Index.cshtml.cs | 0 .../Pages/Shared/_Layout.cshtml | 0 .../Pages/Shared/_LoginPartial.cshtml | 0 .../Pages/_ViewImports.cshtml | 0 .../AzureADB2CSample/Pages/_ViewStart.cshtml | 0 .../samples/AzureADB2CSample/Program.cs | 0 .../samples/AzureADB2CSample/Startup.cs | 0 .../appsettings.Development.json | 0 .../samples/AzureADB2CSample/appsettings.json | 0 .../AzureADB2CSample/wwwroot/css/site.css | 0 .../AzureADB2CSample/wwwroot/css/site.min.css | 0 .../AzureADB2CSample/wwwroot/favicon.ico | Bin .../wwwroot/images/banner1.svg | 0 .../wwwroot/images/banner2.svg | 0 .../wwwroot/images/banner3.svg | 0 .../wwwroot/images/banner4.svg | 0 .../AzureADB2CSample/wwwroot/js/site.js | 0 .../AzureADB2CSample/wwwroot/js/site.min.js | 0 .../wwwroot/lib/bootstrap/.bower.json | 0 .../wwwroot/lib/bootstrap/LICENSE | 0 .../bootstrap/dist/css/bootstrap-theme.css | 0 .../dist/css/bootstrap-theme.css.map | 0 .../dist/css/bootstrap-theme.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../lib/bootstrap/dist/js/bootstrap.js | 0 .../wwwroot/lib/bootstrap/dist/js/npm.js | 0 .../jquery-validation-unobtrusive/.bower.json | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../wwwroot/lib/jquery-validation/.bower.json | 0 .../wwwroot/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../wwwroot/lib/jquery/.bower.json | 0 .../wwwroot/lib/jquery/LICENSE.txt | 0 .../wwwroot/lib/jquery/dist/jquery.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.map | 0 .../ApiAuthenticationTests.cs | 0 ...hentication.AzureAD.FunctionalTests.csproj | 22 + .../WebAuthenticationTests.cs | 0 .../test/FunctionalTests}/xunit.runner.json | 0 .../AzureAD.WebSite/AzureAD.WebSite.csproj | 25 + .../Controllers/TestController.cs | 0 .../testassets}/AzureAD.WebSite/Program.cs | 0 .../testassets}/AzureAD.WebSite/Startup.cs | 0 src/Azure/build.cmd | 3 + src/Azure/startvs.cmd | 3 + src/DataProtection/build.cmd | 4 +- src/Razor/build.cmd | 3 + 143 files changed, 565 insertions(+), 1080 deletions(-) delete mode 100644 src/AADIntegration/.editorconfig delete mode 100644 src/AADIntegration/.gitignore delete mode 100644 src/AADIntegration/AADIntegration.sln delete mode 100644 src/AADIntegration/Directory.Build.props delete mode 100644 src/AADIntegration/Directory.Build.targets delete mode 100644 src/AADIntegration/NuGetPackageVerifier.json delete mode 100644 src/AADIntegration/README.md delete mode 100644 src/AADIntegration/Settings.StyleCop delete mode 100644 src/AADIntegration/build/dependencies.props delete mode 100644 src/AADIntegration/build/repo.props delete mode 100644 src/AADIntegration/build/sources.props delete mode 100644 src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj delete mode 100644 src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json delete mode 100644 src/AADIntegration/src/Directory.Build.props delete mode 100644 src/AADIntegration/test/Directory.Build.props delete mode 100644 src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj delete mode 100644 src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj delete mode 100644 src/AADIntegration/test/WebSites/Directory.Build.props delete mode 100644 src/AADIntegration/version.props create mode 100644 src/Azure/Azure.sln rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Areas/AzureAD/Controllers/AccountController.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Areas/AzureAD/Pages/Account/AccessDenied.cshtml (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Areas/AzureAD/Pages/Account/Error.cshtml (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Areas/AzureAD/Pages/Account/Error.cshtml.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Areas/AzureAD/Pages/Account/SignedOut.cshtml (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Areas/AzureAD/Pages/Account/_viewImports.cshtml (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Areas/AzureAD/Pages/_ViewStart.cshtml (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/AzureADAccountControllerFeatureProvider.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/AzureADAuthenticationBuilderExtensions.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/AzureADDefaults.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/AzureADOptions.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/AzureADOptionsConfiguration.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/AzureADSchemeOptions.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/CookieOptionsConfiguration.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/JwtBearerOptionsConfiguration.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj (69%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/OpenIdConnectOptionsConfiguration.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/Properties/AssemblyInfo.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI => Azure/AzureAD/Authentication.AzureAD.UI/src}/baseline.netcore.json (100%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test => Azure/AzureAD/Authentication.AzureAD.UI/test}/AzureADAuthenticationBuilderExtensionsTests.cs (100%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test => Azure/AzureAD/Authentication.AzureAD.UI/test}/Controllers/AccountControllerTests.cs (100%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test => Azure/AzureAD/Authentication.AzureAD.UI/test}/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj (62%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests => Azure/AzureAD/Authentication.AzureAD.UI/test}/xunit.runner.json (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Areas/AzureADB2C/Controllers/AccountController.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Areas/AzureADB2C/Pages/Account/Error.cshtml (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Areas/AzureADB2C/Pages/_ViewStart.cshtml (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/AzureADB2CAccountControllerFeatureProvider.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/AzureAdB2CAuthenticationBuilderExtensions.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/AzureAdB2CDefaults.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/AzureAdB2COpenIDConnectEventHandlers.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/AzureAdB2COptions.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/AzureAdB2COptionsConfiguration.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/AzureAdB2CSchemeOptions.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/CookieOptionsConfiguration.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/JwtBearerOptionsConfiguration.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj (69%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/OpenIdConnectOptionsConfiguration.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/Properties/AssemblyInfo.cs (100%) rename src/{AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI => Azure/AzureAD/Authentication.AzureADB2C.UI/src}/baseline.netcore.json (100%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test => Azure/AzureAD/Authentication.AzureADB2C.UI/test}/AzureAdB2CAuthenticationBuilderExtensionsTests.cs (100%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test => Azure/AzureAD/Authentication.AzureADB2C.UI/test}/AzureAdB2COpenIDConnectEventHandlersTests.cs (100%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test => Azure/AzureAD/Authentication.AzureADB2C.UI/test}/Controllers/AccountControllerTests.cs (100%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test => Azure/AzureAD/Authentication.AzureADB2C.UI/test}/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj (62%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test => Azure/AzureAD/Authentication.AzureADB2C.UI/test}/xunit.runner.json (100%) rename src/{AADIntegration/test/AADIntegration.ruleset => Azure/AzureAD/AzureAD.ruleset} (69%) create mode 100644 src/Azure/AzureAD/Directory.Build.props create mode 100644 src/Azure/AzureAD/README.md create mode 100644 src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/Pages/Index.cshtml (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/Pages/Index.cshtml.cs (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/Pages/_ViewImports.cshtml (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/Pages/_ViewStart.cshtml (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/Program.cs (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/Startup.cs (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/appsettings.Development.json (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/appsettings.json (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/css/site.css (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/css/site.min.css (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/favicon.ico (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/images/banner1.svg (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/images/banner2.svg (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/images/banner3.svg (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/images/banner4.svg (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/js/site.js (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/js/site.min.js (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js (100%) rename src/{AADIntegration => Azure/AzureAD}/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map (100%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests => Azure/AzureAD/test/FunctionalTests}/ApiAuthenticationTests.cs (100%) create mode 100644 src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests => Azure/AzureAD/test/FunctionalTests}/WebAuthenticationTests.cs (100%) rename src/{AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test => Azure/AzureAD/test/FunctionalTests}/xunit.runner.json (100%) create mode 100644 src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj rename src/{AADIntegration/test/WebSites => Azure/AzureAD/test/testassets}/AzureAD.WebSite/Controllers/TestController.cs (100%) rename src/{AADIntegration/test/WebSites => Azure/AzureAD/test/testassets}/AzureAD.WebSite/Program.cs (100%) rename src/{AADIntegration/test/WebSites => Azure/AzureAD/test/testassets}/AzureAD.WebSite/Startup.cs (100%) create mode 100644 src/Azure/build.cmd create mode 100644 src/Azure/startvs.cmd create mode 100644 src/Razor/build.cmd diff --git a/Directory.Build.targets b/Directory.Build.targets index bd768a49b0..0e9202f0c7 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -38,6 +38,9 @@ true + + true + false diff --git a/build/buildorder.props b/build/buildorder.props index b51d1cfa39..31803c24a5 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -8,7 +8,6 @@ - diff --git a/build/repo.props b/build/repo.props index 042d08c18b..3a93af4b5e 100644 --- a/build/repo.props +++ b/build/repo.props @@ -46,49 +46,60 @@ - - + + + + + + + + + + - + - - + + - - + + - - - + + + + + diff --git a/build/submodules.props b/build/submodules.props index a7e78f1a4d..4b874aa953 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -45,7 +45,6 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 9645bd8e84..0eed5d0ae8 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -24,28 +24,6 @@ 2.1.1 - - - 2.1.6 - - - - - - - - - - - - - - - - - - - 2.1.1 @@ -57,19 +35,6 @@ - - - 2.1.2 - - - - - - - - - - 2.1.1 @@ -79,6 +44,26 @@ + + + 2.1.1 + + + + + + + + + + 2.1.1 + + + + + + + 2.1.2 @@ -156,13 +141,18 @@ - - + + 2.1.2 - + + + + + + @@ -172,6 +162,14 @@ + + + 2.1.2 + + + + + 2.1.3 @@ -541,6 +539,18 @@ + + + 2.1.2 + + + + + + + + + 2.1.3 @@ -615,18 +625,6 @@ - - - 2.1.2 - - - - - - - - - 2.1.3 @@ -661,13 +659,6 @@ - - - 2.1.2 - - - - 2.1.2 @@ -687,6 +678,13 @@ + + + 2.1.2 + + + + 2.1.1 @@ -747,6 +745,17 @@ + + + 2.1.1 + + + + + + + + 2.1.2 @@ -852,17 +861,6 @@ - - - 2.1.1 - - - - - - - - 2.1.1 @@ -929,6 +927,28 @@ + + + 2.1.6 + + + + + + + + + + + + + + + + + + + 2.1.2 @@ -952,6 +972,11 @@ + + + 2.1.2 + + 2.1.2 @@ -960,9 +985,4 @@ - - - 2.1.2 - - \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 3a740e316d..9d3e931544 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -9,10 +9,10 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - - + + @@ -23,8 +23,9 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + + @@ -65,26 +66,27 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + - - + + @@ -92,7 +94,6 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - @@ -100,8 +101,9 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + - + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index bf7171f343..6a89badfc4 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -54,6 +54,7 @@ and are generated based on the last package release. + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 05a7e96c56..059308b49e 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -58,10 +58,6 @@ - - - - @@ -73,11 +69,14 @@ + + + @@ -114,9 +113,7 @@ - - - - + + diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index c3d8cebbcb..467633e75b 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -164,7 +164,7 @@ - + $([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectFullPath))) diff --git a/run.ps1 b/run.ps1 index 6b7e36c6cf..955a61c7e7 100644 --- a/run.ps1 +++ b/run.ps1 @@ -38,6 +38,9 @@ The path to the configuration file that stores values. Defaults to korebuild.jso .PARAMETER CI Sets up CI specific settings and variables. +.PARAMETER Projects +A list of projects to build. (Must be an absolute path.) Globbing patterns are supported, such as "$(pwd)/**/*.csproj" + .PARAMETER PackageVersionPropsUrl (optional) the url of the package versions props path containing dependency versions. @@ -90,6 +93,7 @@ param( [switch]$Reinstall, [string]$ConfigFile = $null, [switch]$CI, + [string]$Projects, [string]$PackageVersionPropsUrl = $null, [string]$AccessTokenSuffix = $null, [string]$RestoreSources = $null, @@ -237,6 +241,11 @@ if ($ProductBuildId) { $MSBuildArguments += "-p:DotNetProductBuildId=$ProductBuildId" } +if ($Projects) { + $MSBuildArguments += "-p:Projects=$Projects" + $MSBuildArguments += "-p:_ProjectsOnly=true" +} + # Execute $korebuildPath = Get-KoreBuild diff --git a/src/AADIntegration/.editorconfig b/src/AADIntegration/.editorconfig deleted file mode 100644 index abd3d48553..0000000000 --- a/src/AADIntegration/.editorconfig +++ /dev/null @@ -1,56 +0,0 @@ -# EditorConfig is awesome:http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Don't use tabs for indentation. -[*] -indent_style = space -# (Please don't specify an indent_size here; that has too many unintended consequences.) - -# Code files -[*.{cs,csx,vb,vbx}] -indent_size = 4 - -# Xml project files -[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] -indent_size = 2 - -# Xml config files -[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}] -indent_size = 2 - -# JSON files -[*.json] -indent_size = 2 - -# Dotnet code style settings: -[*.cs] -# Sort using and Import directives with System.* appearing first -dotnet_sort_system_directives_first = true - -# Don't use this. qualifier -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_property = false:suggestion - -# use int x = .. over Int32 -dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion - -# use int.MaxValue over Int32.MaxValue -dotnet_style_predefined_type_for_member_access = true:suggestion - -# Require var all the time. -csharp_style_var_for_built_in_types = true:suggestion -csharp_style_var_when_type_is_apparent = true:suggestion -csharp_style_var_elsewhere = true:suggestion - -# Disallow throw expressions. -csharp_style_throw_expression = false:suggestion - -# Newline settings -csharp_new_line_before_open_brace = all -csharp_new_line_before_else = true -csharp_new_line_before_catch = true -csharp_new_line_before_finally = true -csharp_new_line_before_members_in_object_initializers = true -csharp_new_line_before_members_in_anonymous_types = true diff --git a/src/AADIntegration/.gitignore b/src/AADIntegration/.gitignore deleted file mode 100644 index e38f0aa101..0000000000 --- a/src/AADIntegration/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -.build/ -.testPublish/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -.vs/ -bower_components/ -node_modules/ -debugSettings.json -project.lock.json -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.settings -*.sln.ide -node_modules -*launchSettings.json -*.orig -.vscode/ -global.json -BenchmarkDotNet.Artifacts/ -.idea/ -msbuild.binlog diff --git a/src/AADIntegration/AADIntegration.sln b/src/AADIntegration/AADIntegration.sln deleted file mode 100644 index 2ed6ef8876..0000000000 --- a/src/AADIntegration/AADIntegration.sln +++ /dev/null @@ -1,79 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{75A812B0-D98C-45F3-B2A9-357BBDF7331A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8CF63E1D-F9F7-4CB4-AD90-88C4077F7BFF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{57F46508-E53D-4F6B-B77C-2EFE95925AEF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureADB2CSample", "samples\AzureADB2CSample\AzureADB2CSample.csproj", "{5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI", "src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj", "{16912327-C9B3-49FC-87E0-49FEDED0A065}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test", "test\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj", "{454089F9-ED16-4A11-9C52-2BA74DCF5D35}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI", "src\Microsoft.AspNetCore.Authentication.AzureAD.UI\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj", "{1762840C-A14A-4498-9883-CC671956F0F2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI.Test", "test\Microsoft.AspNetCore.Authentication.AzureAD.UI.Test\Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj", "{3D0CF896-3A9D-4A8F-A343-A2E1A131C861}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests", "test\Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests\Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj", "{1967296B-614B-43E5-B1BA-A601579961D5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{2AEF59C3-7ADA-404D-B965-26B700FBD03F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureAD.WebSite", "test\WebSites\AzureAD.WebSite\AzureAD.WebSite.csproj", "{4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Release|Any CPU.Build.0 = Release|Any CPU - {16912327-C9B3-49FC-87E0-49FEDED0A065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16912327-C9B3-49FC-87E0-49FEDED0A065}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16912327-C9B3-49FC-87E0-49FEDED0A065}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16912327-C9B3-49FC-87E0-49FEDED0A065}.Release|Any CPU.Build.0 = Release|Any CPU - {454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Release|Any CPU.Build.0 = Release|Any CPU - {1762840C-A14A-4498-9883-CC671956F0F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1762840C-A14A-4498-9883-CC671956F0F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1762840C-A14A-4498-9883-CC671956F0F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1762840C-A14A-4498-9883-CC671956F0F2}.Release|Any CPU.Build.0 = Release|Any CPU - {3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Release|Any CPU.Build.0 = Release|Any CPU - {1967296B-614B-43E5-B1BA-A601579961D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1967296B-614B-43E5-B1BA-A601579961D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1967296B-614B-43E5-B1BA-A601579961D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1967296B-614B-43E5-B1BA-A601579961D5}.Release|Any CPU.Build.0 = Release|Any CPU - {4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {5D2378D4-9DDA-468F-82C6-AE4DAA54E96C} = {8CF63E1D-F9F7-4CB4-AD90-88C4077F7BFF} - {16912327-C9B3-49FC-87E0-49FEDED0A065} = {75A812B0-D98C-45F3-B2A9-357BBDF7331A} - {454089F9-ED16-4A11-9C52-2BA74DCF5D35} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF} - {1762840C-A14A-4498-9883-CC671956F0F2} = {75A812B0-D98C-45F3-B2A9-357BBDF7331A} - {3D0CF896-3A9D-4A8F-A343-A2E1A131C861} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF} - {1967296B-614B-43E5-B1BA-A601579961D5} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF} - {2AEF59C3-7ADA-404D-B965-26B700FBD03F} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF} - {4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316} = {2AEF59C3-7ADA-404D-B965-26B700FBD03F} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {C6DBF56C-E862-46EA-A4E0-993D2950D78D} - EndGlobalSection -EndGlobal diff --git a/src/AADIntegration/Directory.Build.props b/src/AADIntegration/Directory.Build.props deleted file mode 100644 index 99160dadb6..0000000000 --- a/src/AADIntegration/Directory.Build.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core AAD Integration - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)..\..\eng\AspNetCore.snk - true - true - true - - - diff --git a/src/AADIntegration/Directory.Build.targets b/src/AADIntegration/Directory.Build.targets deleted file mode 100644 index 53b3f6e1da..0000000000 --- a/src/AADIntegration/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/AADIntegration/NuGetPackageVerifier.json b/src/AADIntegration/NuGetPackageVerifier.json deleted file mode 100644 index adc8b62fce..0000000000 --- a/src/AADIntegration/NuGetPackageVerifier.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ], - "packages": { - "Microsoft.AspNetCore.Authentication.AzureADB2C.UI": { - "Exclusions": { - "DOC_MISSING": { - "lib/netstandard2.0/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Views.dll": "This library contains precompiled views." - } - } - }, - "Microsoft.AspNetCore.Authentication.AzureAD.UI": { - "Exclusions": { - "DOC_MISSING": { - "lib/netstandard2.0/Microsoft.AspNetCore.Authentication.AzureAD.UI.Views.dll": "This library contains precompiled views." - } - } - } - } - } -} \ No newline at end of file diff --git a/src/AADIntegration/README.md b/src/AADIntegration/README.md deleted file mode 100644 index 5155df07d9..0000000000 --- a/src/AADIntegration/README.md +++ /dev/null @@ -1,14 +0,0 @@ -ASP.NET Core Azure Active Directory Integration -=== - - - -ASP.NET Core Azure Active Directory Integration provides seamless authentication integration with different Azure Active Directory services like Azure Active Directory and Azure Active Directory B2C for ASP.NET Core applications. - -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. - -## Building from source - -To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. See [developer documentation](https://github.com/aspnet/Home/wiki) for more details. diff --git a/src/AADIntegration/Settings.StyleCop b/src/AADIntegration/Settings.StyleCop deleted file mode 100644 index 7b8130298c..0000000000 --- a/src/AADIntegration/Settings.StyleCop +++ /dev/null @@ -1,455 +0,0 @@ - - - NoMerge - - - - - False - - - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - - as - db - dc - do - ef - id - if - in - is - my - no - on - sl - to - ui - vs - - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - True - True - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - - - - Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - - - - - - False - - - - - - - False - - - - - False - - - - - - - - - Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - - - - - - 120 - - - - \ No newline at end of file diff --git a/src/AADIntegration/build/dependencies.props b/src/AADIntegration/build/dependencies.props deleted file mode 100644 index a7da074d56..0000000000 --- a/src/AADIntegration/build/dependencies.props +++ /dev/null @@ -1,47 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.1.3-rtm-15802 - 2.0.0 - 2.1.2 - 15.6.1 - 4.7.49 - 2.0.3 - 0.8.0 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - 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.2 - 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.1 - - \ No newline at end of file diff --git a/src/AADIntegration/build/repo.props b/src/AADIntegration/build/repo.props deleted file mode 100644 index 1dc8b8100d..0000000000 --- a/src/AADIntegration/build/repo.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/AADIntegration/build/sources.props b/src/AADIntegration/build/sources.props deleted file mode 100644 index f23d255142..0000000000 --- a/src/AADIntegration/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; - - - \ No newline at end of file diff --git a/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj b/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj deleted file mode 100644 index 563c155642..0000000000 --- a/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - netcoreapp2.1 - $(TargetFrameworks);netcoreapp2.0 - $(TargetFrameworks);net461 - - - - true - - - - - - - - - - - - - - - - - diff --git a/src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json b/src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json deleted file mode 100644 index 1ee213cd17..0000000000 --- a/src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:59364/", - "sslPort": 44315 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "AzureADB2CSample": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:44315/;http://localhost:59364/" - } - } -} \ No newline at end of file diff --git a/src/AADIntegration/src/Directory.Build.props b/src/AADIntegration/src/Directory.Build.props deleted file mode 100644 index 4b89a431e7..0000000000 --- a/src/AADIntegration/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/AADIntegration/test/Directory.Build.props b/src/AADIntegration/test/Directory.Build.props deleted file mode 100644 index 92adb7d61c..0000000000 --- a/src/AADIntegration/test/Directory.Build.props +++ /dev/null @@ -1,25 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 - $(StandardTestTfms);net461 - - - - false - xUnit1026:$(WarningsNotAsErrors) - $(MSBuildThisFileDirectory)AADIntegration.ruleset - - - - - - - - - - - diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj deleted file mode 100644 index f0cb193135..0000000000 --- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj b/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj deleted file mode 100644 index b42cbf7947..0000000000 --- a/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - $(StandardTestWebsiteTfms) - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/AADIntegration/test/WebSites/Directory.Build.props b/src/AADIntegration/test/WebSites/Directory.Build.props deleted file mode 100644 index 5d16f204a2..0000000000 --- a/src/AADIntegration/test/WebSites/Directory.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - netcoreapp2.1 - $(DeveloperBuildTestWebsiteTfms) - $(StandardTestWebsiteTfms);netcoreapp2.0 - $(StandardTestWebsiteTfms);net461 - - \ No newline at end of file diff --git a/src/AADIntegration/version.props b/src/AADIntegration/version.props deleted file mode 100644 index 94459da446..0000000000 --- a/src/AADIntegration/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 2.1.1 - 0.4.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - $(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln new file mode 100644 index 0000000000..56ef0ae6f2 --- /dev/null +++ b/src/Azure/Azure.sln @@ -0,0 +1,284 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAD", "AzureAD", "{B931802A-45BB-49A4-9919-B36C827100AC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.AzureAD.UI", "Authentication.AzureAD.UI", "{312795E1-D5E2-4021-8FEA-342CA6F14CC8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI", "AzureAD\Authentication.AzureAD.UI\src\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj", "{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI.Test", "AzureAD\Authentication.AzureAD.UI\test\Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj", "{06817D18-5694-454E-A010-CDAECD8AF89B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.AzureADB2C.UI", "Authentication.AzureADB2C.UI", "{79FE11AB-8D1E-4DEF-81C0-9B352769BFA4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI", "AzureAD\Authentication.AzureADB2C.UI\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj", "{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test", "AzureAD\Authentication.AzureADB2C.UI\test\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj", "{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A28A64CA-297E-4023-895A-483DFDA59FBE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureADB2CSample", "AzureAD\samples\AzureADB2CSample\AzureADB2CSample.csproj", "{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F4F1E3C9-38E5-49EC-8688-A2D16AA8807B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests", "AzureAD\test\FunctionalTests\Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj", "{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{0F577D33-2EA4-4182-9D89-2EFB022A2835}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAD.WebSite", "AzureAD\test\testassets\AzureAD.WebSite\AzureAD.WebSite.csproj", "{84E67496-B000-4AAD-9626-2135F677C4F1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{84622717-F98A-4DE2-806E-1EF89C45C0EB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{B1385496-607F-4573-ABE9-D9FE88D96DB8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{6EFFA596-23E7-498C-8D5E-331C6D8E945D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9631D314-7B0C-4CEC-8650-0259A8F4C77A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{240BBDB1-3501-4637-8A17-996EA4EBB20B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{88EF760A-99A2-48C8-920F-78632A3BB57A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{9593691E-1B65-4EB1-97AA-F8B292B0082A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x64.ActiveCfg = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x64.Build.0 = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x86.ActiveCfg = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x86.Build.0 = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|Any CPU.Build.0 = Release|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x64.ActiveCfg = Release|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x64.Build.0 = Release|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x86.ActiveCfg = Release|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x86.Build.0 = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x64.ActiveCfg = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x64.Build.0 = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x86.ActiveCfg = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x86.Build.0 = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|Any CPU.Build.0 = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x64.ActiveCfg = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x64.Build.0 = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x86.ActiveCfg = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x86.Build.0 = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x64.ActiveCfg = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x64.Build.0 = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x86.ActiveCfg = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x86.Build.0 = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|Any CPU.Build.0 = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x64.ActiveCfg = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x64.Build.0 = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x86.ActiveCfg = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x86.Build.0 = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x64.ActiveCfg = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x64.Build.0 = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x86.ActiveCfg = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x86.Build.0 = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|Any CPU.Build.0 = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x64.ActiveCfg = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x64.Build.0 = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x86.ActiveCfg = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x86.Build.0 = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x64.ActiveCfg = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x64.Build.0 = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x86.ActiveCfg = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x86.Build.0 = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|Any CPU.Build.0 = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x64.ActiveCfg = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x64.Build.0 = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x86.ActiveCfg = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x86.Build.0 = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x64.ActiveCfg = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x64.Build.0 = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x86.ActiveCfg = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x86.Build.0 = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|Any CPU.Build.0 = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x64.ActiveCfg = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x64.Build.0 = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x86.ActiveCfg = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x86.Build.0 = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x64.ActiveCfg = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x64.Build.0 = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x86.ActiveCfg = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x86.Build.0 = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|Any CPU.Build.0 = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x64.ActiveCfg = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x64.Build.0 = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x86.ActiveCfg = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x86.Build.0 = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x64.ActiveCfg = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x64.Build.0 = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x86.ActiveCfg = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x86.Build.0 = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|Any CPU.Build.0 = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x64.ActiveCfg = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x64.Build.0 = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x86.ActiveCfg = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x86.Build.0 = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x64.ActiveCfg = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x64.Build.0 = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x86.ActiveCfg = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x86.Build.0 = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|Any CPU.Build.0 = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x64.ActiveCfg = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x64.Build.0 = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x86.ActiveCfg = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x86.Build.0 = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x64.ActiveCfg = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x64.Build.0 = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x86.ActiveCfg = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x86.Build.0 = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|Any CPU.Build.0 = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x64.ActiveCfg = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x64.Build.0 = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x86.ActiveCfg = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x86.Build.0 = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x64.ActiveCfg = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x64.Build.0 = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x86.ActiveCfg = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x86.Build.0 = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|Any CPU.Build.0 = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x64.ActiveCfg = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x64.Build.0 = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x86.ActiveCfg = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x86.Build.0 = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x64.ActiveCfg = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x64.Build.0 = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x86.ActiveCfg = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x86.Build.0 = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|Any CPU.Build.0 = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x64.ActiveCfg = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x64.Build.0 = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x86.ActiveCfg = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x86.Build.0 = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x64.ActiveCfg = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x64.Build.0 = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x86.ActiveCfg = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x86.Build.0 = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|Any CPU.Build.0 = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x64.ActiveCfg = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x64.Build.0 = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x86.ActiveCfg = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x86.Build.0 = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x64.ActiveCfg = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x64.Build.0 = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x86.ActiveCfg = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x86.Build.0 = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|Any CPU.Build.0 = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x64.ActiveCfg = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x64.Build.0 = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x86.ActiveCfg = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x86.Build.0 = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x64.ActiveCfg = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x64.Build.0 = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x86.ActiveCfg = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x86.Build.0 = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|Any CPU.Build.0 = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x64.ActiveCfg = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x64.Build.0 = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x86.ActiveCfg = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x86.Build.0 = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x64.ActiveCfg = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x64.Build.0 = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x86.ActiveCfg = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x86.Build.0 = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|Any CPU.Build.0 = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x64.ActiveCfg = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x64.Build.0 = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.ActiveCfg = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {312795E1-D5E2-4021-8FEA-342CA6F14CC8} = {B931802A-45BB-49A4-9919-B36C827100AC} + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58} = {312795E1-D5E2-4021-8FEA-342CA6F14CC8} + {06817D18-5694-454E-A010-CDAECD8AF89B} = {312795E1-D5E2-4021-8FEA-342CA6F14CC8} + {79FE11AB-8D1E-4DEF-81C0-9B352769BFA4} = {B931802A-45BB-49A4-9919-B36C827100AC} + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C} = {79FE11AB-8D1E-4DEF-81C0-9B352769BFA4} + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51} = {79FE11AB-8D1E-4DEF-81C0-9B352769BFA4} + {A28A64CA-297E-4023-895A-483DFDA59FBE} = {B931802A-45BB-49A4-9919-B36C827100AC} + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE} = {A28A64CA-297E-4023-895A-483DFDA59FBE} + {F4F1E3C9-38E5-49EC-8688-A2D16AA8807B} = {B931802A-45BB-49A4-9919-B36C827100AC} + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951} = {F4F1E3C9-38E5-49EC-8688-A2D16AA8807B} + {0F577D33-2EA4-4182-9D89-2EFB022A2835} = {F4F1E3C9-38E5-49EC-8688-A2D16AA8807B} + {84E67496-B000-4AAD-9626-2135F677C4F1} = {0F577D33-2EA4-4182-9D89-2EFB022A2835} + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {B1385496-607F-4573-ABE9-D9FE88D96DB8} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {6EFFA596-23E7-498C-8D5E-331C6D8E945D} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {9631D314-7B0C-4CEC-8650-0259A8F4C77A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {240BBDB1-3501-4637-8A17-996EA4EBB20B} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {88EF760A-99A2-48C8-920F-78632A3BB57A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {9593691E-1B65-4EB1-97AA-F8B292B0082A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {81AADD49-473B-43ED-8A08-F6B7A058AA39} + EndGlobalSection +EndGlobal diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Controllers/AccountController.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Controllers/AccountController.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/_viewImports.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/_viewImports.cshtml rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/_ViewStart.cshtml rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAccountControllerFeatureProvider.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAccountControllerFeatureProvider.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAuthenticationBuilderExtensions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAuthenticationBuilderExtensions.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADDefaults.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADDefaults.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptions.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADSchemeOptions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADSchemeOptions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADSchemeOptions.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADSchemeOptions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/CookieOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/CookieOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/CookieOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/CookieOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/JwtBearerOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/JwtBearerOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/JwtBearerOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/JwtBearerOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj similarity index 69% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj index 710d066434..52e285c025 100644 --- a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj +++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj @@ -10,11 +10,10 @@ - - - - - + + + + @@ -28,10 +27,10 @@ <_Parameter2>$(BuildNumber) - + - + diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/OpenIdConnectOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/OpenIdConnectOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/OpenIdConnectOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/OpenIdConnectOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Properties/AssemblyInfo.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Properties/AssemblyInfo.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Properties/AssemblyInfo.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/baseline.netcore.json b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/baseline.netcore.json similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/baseline.netcore.json rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/baseline.netcore.json diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/AzureADAuthenticationBuilderExtensionsTests.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/AzureADAuthenticationBuilderExtensionsTests.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Controllers/AccountControllerTests.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Controllers/AccountControllerTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Controllers/AccountControllerTests.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/Controllers/AccountControllerTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj similarity index 62% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj index 4daafb39ac..2b3fedc888 100644 --- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj +++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp2.1;net461 Microsoft.AspNetCore.Authentication.AzureAD.UI @@ -12,7 +12,7 @@ - + diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/xunit.runner.json b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/xunit.runner.json similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/xunit.runner.json rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/xunit.runner.json diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Controllers/AccountController.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Controllers/AccountController.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/_ViewStart.cshtml rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureADB2CAccountControllerFeatureProvider.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureADB2CAccountControllerFeatureProvider.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CAuthenticationBuilderExtensions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CAuthenticationBuilderExtensions.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CDefaults.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CDefaults.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COpenIDConnectEventHandlers.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COpenIDConnectEventHandlers.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptions.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CSchemeOptions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CSchemeOptions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CSchemeOptions.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CSchemeOptions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/CookieOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/CookieOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/CookieOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/CookieOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/JwtBearerOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/JwtBearerOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/JwtBearerOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/JwtBearerOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj similarity index 69% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj index e63e02980f..cc93f8f052 100644 --- a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj +++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj @@ -10,11 +10,10 @@ - - - - - + + + + @@ -28,10 +27,10 @@ <_Parameter2>$(BuildNumber) - + - + diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/OpenIdConnectOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/OpenIdConnectOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/OpenIdConnectOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/OpenIdConnectOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Properties/AssemblyInfo.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Properties/AssemblyInfo.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Properties/AssemblyInfo.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/baseline.netcore.json b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/baseline.netcore.json similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/baseline.netcore.json rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/baseline.netcore.json diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2COpenIDConnectEventHandlersTests.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2COpenIDConnectEventHandlersTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2COpenIDConnectEventHandlersTests.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2COpenIDConnectEventHandlersTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Controllers/AccountControllerTests.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Controllers/AccountControllerTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Controllers/AccountControllerTests.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Controllers/AccountControllerTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj similarity index 62% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj index a838fc2703..3e4b8691f4 100644 --- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj +++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp2.1;net461 Microsoft.AspNetCore.Authentication.AzureADB2C.UI @@ -12,7 +12,7 @@ - + diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/xunit.runner.json b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/xunit.runner.json similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/xunit.runner.json rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/xunit.runner.json diff --git a/src/AADIntegration/test/AADIntegration.ruleset b/src/Azure/AzureAD/AzureAD.ruleset similarity index 69% rename from src/AADIntegration/test/AADIntegration.ruleset rename to src/Azure/AzureAD/AzureAD.ruleset index 23f2deac4a..57375fd55d 100644 --- a/src/AADIntegration/test/AADIntegration.ruleset +++ b/src/Azure/AzureAD/AzureAD.ruleset @@ -1,7 +1,7 @@  - + - diff --git a/src/Azure/AzureAD/Directory.Build.props b/src/Azure/AzureAD/Directory.Build.props new file mode 100644 index 0000000000..647d706b5a --- /dev/null +++ b/src/Azure/AzureAD/Directory.Build.props @@ -0,0 +1,8 @@ + + + + + xUnit1026:$(WarningsNotAsErrors) + $(MSBuildThisFileDirectory)AzureAD.ruleset + + diff --git a/src/Azure/AzureAD/README.md b/src/Azure/AzureAD/README.md new file mode 100644 index 0000000000..6086294419 --- /dev/null +++ b/src/Azure/AzureAD/README.md @@ -0,0 +1,4 @@ +Azure Active Directory Integration +================================== + +ASP.NET Core Azure Active Directory Integration provides seamless authentication integration with different Azure Active Directory services like Azure Active Directory and Azure Active Directory B2C for ASP.NET Core applications. \ No newline at end of file diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj new file mode 100644 index 0000000000..1074eff59f --- /dev/null +++ b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj @@ -0,0 +1,22 @@ + + + + netcoreapp2.1;net461 + + + + true + + + + + + + + + + + + + + diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml.cs b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml.cs similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml.cs rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml.cs diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewImports.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewImports.cshtml rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewStart.cshtml similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewStart.cshtml rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewStart.cshtml diff --git a/src/AADIntegration/samples/AzureADB2CSample/Program.cs b/src/Azure/AzureAD/samples/AzureADB2CSample/Program.cs similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Program.cs rename to src/Azure/AzureAD/samples/AzureADB2CSample/Program.cs diff --git a/src/AADIntegration/samples/AzureADB2CSample/Startup.cs b/src/Azure/AzureAD/samples/AzureADB2CSample/Startup.cs similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Startup.cs rename to src/Azure/AzureAD/samples/AzureADB2CSample/Startup.cs diff --git a/src/AADIntegration/samples/AzureADB2CSample/appsettings.Development.json b/src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.Development.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/appsettings.Development.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.Development.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/appsettings.json b/src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/appsettings.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.css similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.css rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.css diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.min.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.min.css similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.min.css rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.min.css diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/favicon.ico b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/favicon.ico similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/favicon.ico rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/favicon.ico diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner1.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner1.svg similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner1.svg rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner1.svg diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner2.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner2.svg similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner2.svg rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner2.svg diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner3.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner3.svg similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner3.svg rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner3.svg diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner4.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner4.svg similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner4.svg rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner4.svg diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.min.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.min.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.min.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.min.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/ApiAuthenticationTests.cs b/src/Azure/AzureAD/test/FunctionalTests/ApiAuthenticationTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/ApiAuthenticationTests.cs rename to src/Azure/AzureAD/test/FunctionalTests/ApiAuthenticationTests.cs diff --git a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj new file mode 100644 index 0000000000..059d4a8e12 --- /dev/null +++ b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj @@ -0,0 +1,22 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + + + + + + + + + + diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/WebAuthenticationTests.cs b/src/Azure/AzureAD/test/FunctionalTests/WebAuthenticationTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/WebAuthenticationTests.cs rename to src/Azure/AzureAD/test/FunctionalTests/WebAuthenticationTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/xunit.runner.json b/src/Azure/AzureAD/test/FunctionalTests/xunit.runner.json similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/xunit.runner.json rename to src/Azure/AzureAD/test/FunctionalTests/xunit.runner.json diff --git a/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj new file mode 100644 index 0000000000..2464d62582 --- /dev/null +++ b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj @@ -0,0 +1,25 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + + + + + + + + + + + + + diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/Controllers/TestController.cs b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Controllers/TestController.cs similarity index 100% rename from src/AADIntegration/test/WebSites/AzureAD.WebSite/Controllers/TestController.cs rename to src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Controllers/TestController.cs diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/Program.cs b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Program.cs similarity index 100% rename from src/AADIntegration/test/WebSites/AzureAD.WebSite/Program.cs rename to src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Program.cs diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/Startup.cs b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Startup.cs similarity index 100% rename from src/AADIntegration/test/WebSites/AzureAD.WebSite/Startup.cs rename to src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Startup.cs diff --git a/src/Azure/build.cmd b/src/Azure/build.cmd new file mode 100644 index 0000000000..69e9805008 --- /dev/null +++ b/src/Azure/build.cmd @@ -0,0 +1,3 @@ +@ECHO OFF +SET RepoRoot=%~dp0..\.. +%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -Projects %~dp0\**\*.*proj %* diff --git a/src/Azure/startvs.cmd b/src/Azure/startvs.cmd new file mode 100644 index 0000000000..458c43b11a --- /dev/null +++ b/src/Azure/startvs.cmd @@ -0,0 +1,3 @@ +@ECHO OFF + +%~dp0..\..\startvs.cmd %~dp0Azure.sln diff --git a/src/DataProtection/build.cmd b/src/DataProtection/build.cmd index f4169ea5e4..f22573197f 100644 --- a/src/DataProtection/build.cmd +++ b/src/DataProtection/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF -SET RepoRoot="%~dp0..\.." -%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -Path %~dp0 %* +SET RepoRoot=%~dp0..\.. +%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -projects %~dp0**\*.*proj %* diff --git a/src/Razor/build.cmd b/src/Razor/build.cmd new file mode 100644 index 0000000000..f22573197f --- /dev/null +++ b/src/Razor/build.cmd @@ -0,0 +1,3 @@ +@ECHO OFF +SET RepoRoot=%~dp0..\.. +%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -projects %~dp0**\*.*proj %* From 167695fad2750358ee8c4190f17d4ba94cbe074e Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 21 Dec 2018 13:36:57 -0800 Subject: [PATCH 11/80] Port native project ref changes to 2.1 (#6071) --- Directory.Build.props | 1 + eng/targets/ResolveIisReferences.targets | 83 +++++++++++++++++++ src/Servers/IIS/.gitignore | 6 +- .../ServerComparison.FunctionalTests.csproj | 5 -- .../ServerComparison.TestSites.csproj | 4 +- 5 files changed, 89 insertions(+), 10 deletions(-) create mode 100644 eng/targets/ResolveIisReferences.targets diff --git a/Directory.Build.props b/Directory.Build.props index 5454304e42..8d176f3b4d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -46,5 +46,6 @@ + diff --git a/eng/targets/ResolveIisReferences.targets b/eng/targets/ResolveIisReferences.targets new file mode 100644 index 0000000000..bd3aefd5c1 --- /dev/null +++ b/eng/targets/ResolveIisReferences.targets @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + Platform=x64 + + x64\%(HandlerPath)\ + + false + + NativeContent + + PreserveNewest + + Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup + + true + TargetFramework + + All + + true + + + + + Platform=x86 + + x86\%(HandlerPath)\ + + false + + NativeContent + + PreserveNewest + + Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup + + true + TargetFramework + + All + + true + + + + + + + + + + + + + %(LinkBase)%(FileName)%(Extension) + + false + + + + + + + + + \ No newline at end of file diff --git a/src/Servers/IIS/.gitignore b/src/Servers/IIS/.gitignore index f72b4575d1..5b91e632d0 100644 --- a/src/Servers/IIS/.gitignore +++ b/src/Servers/IIS/.gitignore @@ -35,10 +35,8 @@ project.lock.json *.tlog *.CppClean.log *msbuild.log -src/*/*/Debug/ -src/*/*/x64/Debug/ -src/*/*/Release/ -src/*/*/x64/Release/ +Debug/ +Release/ x64/ *vcxproj.filters *.aps diff --git a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj index 0ba6d8dd9b..4376cb72a0 100644 --- a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj +++ b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -9,11 +9,6 @@ - - - - - diff --git a/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj index 759a75b222..9c041963b1 100644 --- a/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj +++ b/src/Servers/testassets/TestSites/ServerComparison.TestSites.csproj @@ -1,12 +1,14 @@  + + netcoreapp2.1;netcoreapp2.0;net461 win7-x86;win7-x64;linux-x64;osx-x64 - + From edcee859f08bc951e27125307da461fa189a080d Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 21 Dec 2018 15:29:35 -0800 Subject: [PATCH 12/80] Convert Identity to Reference (#6086) * Convert Identity to Reference * Remove Microsoft.AspNet.Identity.AspNetCoreCompat --- build/artifacts.props | 1 - build/buildorder.props | 1 - build/dependencies.props | 2 + build/repo.props | 5 + build/submodules.props | 1 - eng/Baseline.Designer.props | 60 ++ eng/Baseline.xml | 6 + eng/Dependencies.props | 3 + eng/ProjectReferences.props | 6 + src/Identity/.gitignore | 32 - src/Identity/Directory.Build.props | 21 - src/Identity/Directory.Build.targets | 7 - .../{src/EF => EF/src}/IdentityDbContext.cs | 0 ...dentityEntityFrameworkBuilderExtensions.cs | 0 .../{src/EF => EF/src}/IdentityUserContext.cs | 0 ...etCore.Identity.EntityFrameworkCore.csproj | 9 +- .../src}/Properties/Resources.Designer.cs | 0 .../{src/EF => EF/src}/Resources.resx | 0 src/Identity/{src/EF => EF/src}/RoleStore.cs | 0 .../{src/EF => EF/src}/UserOnlyStore.cs | 0 src/Identity/{src/EF => EF/src}/UserStore.cs | 0 .../{src/EF => EF/src}/baseline.netcore.json | 0 .../test/EF.InMemory.Test/InMemoryContext.cs | 0 .../InMemoryEFOnlyUsersTest.cs | 0 .../InMemoryEFUserStoreTest.cs | 0 .../InMemoryStoreWithGenericsTest.cs | 0 ...y.EntityFrameworkCore.InMemory.Test.csproj | 20 + .../test/EF.InMemory.Test/RoleStoreTest.cs | 0 .../EF.InMemory.Test/TestIdentityFactory.cs | 0 .../test/EF.Test/ApiConsistencyTest.cs | 0 .../{ => EF}/test/EF.Test/CustomPocoTest.cs | 0 src/Identity/{ => EF}/test/EF.Test/DbUtil.cs | 0 .../{ => EF}/test/EF.Test/DefaultPocoTest.cs | 0 .../test/EF.Test/MaxKeyLengthSchemaTest.cs | 0 ...e.Identity.EntityFrameworkCore.Test.csproj | 26 + .../test/EF.Test/SqlStoreOnlyUsersTestBase.cs | 0 .../{ => EF}/test/EF.Test/SqlStoreTestBase.cs | 0 .../test/EF.Test/UserOnlyCustomContextTest.cs | 0 .../{ => EF}/test/EF.Test/UserOnlyTest.cs | 0 .../UserStoreEncryptPersonalDataTest.cs | 0 .../test/EF.Test/UserStoreGuidKeyTest.cs | 0 .../test/EF.Test/UserStoreIntKeyTest.cs | 0 .../test/EF.Test/UserStoreStringKeyTest.cs | 0 .../{ => EF}/test/EF.Test/UserStoreTest.cs | 0 .../test/EF.Test/UserStoreWithGenericsTest.cs | 0 .../Utilities/ScratchDatabaseFixture.cs | 0 .../EF.Test/Utilities/SqlServerTestStore.cs | 0 .../test/EF.Test/Utilities/TestEnvironment.cs | 0 .../{ => EF}/test/EF.Test/config.json | 0 .../Core/src}/AuthenticatorTokenProvider.cs | 0 .../Core => Extensions/Core/src}/Base32.cs | 0 .../Core/src}/ClaimsIdentityOptions.cs | 0 .../Core/src}/DefaultPersonalDataProtector.cs | 0 .../Core/src}/EmailTokenProvider.cs | 0 .../Core/src}/ILookupNormalizer.cs | 0 .../Core/src}/ILookupProtector.cs | 0 .../Core/src}/ILookupProtectorKeyRing.cs | 0 .../Core/src}/IPasswordHasher.cs | 0 .../Core/src}/IPasswordValidator.cs | 0 .../Core/src}/IPersonalDataProtector.cs | 0 .../Core/src}/IProtectedUserStore.cs | 0 .../Core/src}/IQueryableRoleStore.cs | 0 .../Core/src}/IQueryableUserStore.cs | 0 .../Core/src}/IRoleClaimStore.cs | 0 .../Core/src}/IRoleStore.cs | 0 .../Core/src}/IRoleValidator.cs | 0 .../src}/IUserAuthenticationTokenStore.cs | 0 .../Core/src}/IUserAuthenticatorKeyStore.cs | 0 .../Core/src}/IUserClaimStore.cs | 0 .../Core/src}/IUserClaimsPrincipalFactory.cs | 0 .../Core/src}/IUserEmailStore.cs | 0 .../Core/src}/IUserLockoutStore.cs | 0 .../Core/src}/IUserLoginStore.cs | 0 .../Core/src}/IUserPasswordStore.cs | 0 .../Core/src}/IUserPhoneNumberStore.cs | 0 .../Core/src}/IUserRoleStore.cs | 0 .../Core/src}/IUserSecurityStampStore.cs | 0 .../Core/src}/IUserStore.cs | 0 .../src}/IUserTwoFactorRecoveryCodeStore.cs | 0 .../Core/src}/IUserTwoFactorStore.cs | 0 .../Core/src}/IUserTwoFactorTokenProvider.cs | 0 .../Core/src}/IUserValidator.cs | 0 .../Core/src}/IdentityBuilder.cs | 0 .../Core/src}/IdentityError.cs | 0 .../Core/src}/IdentityErrorDescriber.cs | 0 .../Core/src}/IdentityOptions.cs | 0 .../Core/src}/IdentityResult.cs | 0 .../IdentityServiceCollectionExtensions.cs | 0 .../Core/src}/LockoutOptions.cs | 0 .../Microsoft.Extensions.Identity.Core.csproj | 8 +- .../Core/src}/PasswordHasher.cs | 0 .../src}/PasswordHasherCompatibilityMode.cs | 0 .../Core/src}/PasswordHasherOptions.cs | 0 .../Core/src}/PasswordOptions.cs | 0 .../Core/src}/PasswordValidator.cs | 0 .../Core/src}/PasswordVerificationResult.cs | 0 .../Core/src}/PersonalDataAttribute.cs | 0 .../Core/src}/PhoneNumberTokenProvider.cs | 0 .../Core/src}/PrincipalExtensions.cs | 0 .../Core/src}/Properties/AssemblyInfo.cs | 0 .../src}/Properties/Resources.Designer.cs | 0 .../src}/ProtectedPersonalDataAttribute.cs | 0 .../Core/src}/Resources.resx | 0 .../Core/src}/Rfc6238AuthenticationService.cs | 0 .../Core/src}/RoleManager.cs | 0 .../Core/src}/RoleValidator.cs | 0 .../Core/src}/SignInOptions.cs | 0 .../Core/src}/SignInResult.cs | 0 .../Core/src}/StoreOptions.cs | 0 .../Core/src}/TokenOptions.cs | 0 .../Core/src}/TokenProviderDescriptor.cs | 0 .../TotpSecurityStampBasedTokenProvider.cs | 0 .../src}/UpperInvariantLookupNormalizer.cs | 0 .../Core/src}/UserClaimsPrincipalFactory.cs | 0 .../Core/src}/UserLoginInfo.cs | 0 .../Core/src}/UserManager.cs | 0 .../Core/src}/UserOptions.cs | 0 .../Core/src}/UserValidator.cs | 0 .../Core/src}/baseline.netcore.json | 0 .../Stores/src}/IdentityRole.cs | 0 .../Stores/src}/IdentityRoleClaim.cs | 0 .../Stores/src}/IdentityUser.cs | 0 .../Stores/src}/IdentityUserClaim.cs | 0 .../Stores/src}/IdentityUserLogin.cs | 0 .../Stores/src}/IdentityUserRole.cs | 0 .../Stores/src}/IdentityUserToken.cs | 0 ...icrosoft.Extensions.Identity.Stores.csproj | 9 +- .../Stores/src}/RoleStoreBase.cs | 0 .../Stores/src}/UserStoreBase.cs | 0 .../Stores/src}/baseline.netcore.json | 0 src/Identity/Identity.sln | 936 ++++++++++-------- .../Core/src}/AspNetRoleManager.cs | 0 .../Core/src}/AspNetUserManager.cs | 0 .../Core/src}/BuilderExtensions.cs | 0 .../Core/src}/DataProtectionTokenProvider.cs | 0 .../DataProtectionTokenProviderOptions.cs | 0 .../Core/src}/ExternalLoginInfo.cs | 0 .../Core/src}/ISecurityStampValidator.cs | 0 .../src}/ITwoFactorSecurityStampValidator.cs | 0 .../Core/src}/IdentityBuilderExtensions.cs | 0 .../Core/src}/IdentityConstants.cs | 0 .../Core/src}/IdentityCookiesBuilder.cs | 0 .../src}/IdentityCookiesBuilderExtensions.cs | 0 .../IdentityServiceCollectionExtensions.cs | 0 .../src}/Microsoft.AspNetCore.Identity.csproj | 11 +- .../Core/src}/Properties/AssemblyInfo.cs | 0 .../src}/Properties/Resources.Designer.cs | 0 .../Core/src}/Properties/debugSettings.json | 0 .../Core/src}/Resources.resx | 0 ...SecurityStampRefreshingPrincipalContext.cs | 0 .../Core/src}/SecurityStampValidator.cs | 0 .../src}/SecurityStampValidatorOptions.cs | 0 .../Core/src}/SignInManager.cs | 0 .../src}/TwoFactorSecurityStampValidator.cs | 0 .../Core/src}/baseline.netcore.json | 0 .../Core/src}/baseline.netframework.json | 0 src/Identity/{ => Identity}/README.md | 10 +- .../src}/IdentityResultAssert.cs | 0 .../src}/IdentitySpecificationTestBase.cs | 0 ...etCore.Identity.Specification.Tests.csproj | 20 + .../Specification.Tests/src}/TestLogger.cs | 0 .../src}/UserManagerSpecificationTests.cs | 0 .../src}/baseline.netcore.json | 0 .../Filters/ExternalLoginsPageFilter.cs | 0 .../Pages/Account/AccessDenied.cshtml | 0 .../Pages/Account/AccessDenied.cshtml.cs | 0 .../Pages/Account/ConfirmEmail.cshtml | 0 .../Pages/Account/ConfirmEmail.cshtml.cs | 0 .../Pages/Account/ExternalLogin.cshtml | 0 .../Pages/Account/ExternalLogin.cshtml.cs | 0 .../Pages/Account/ForgotPassword.cshtml | 0 .../Pages/Account/ForgotPassword.cshtml.cs | 0 .../Account/ForgotPasswordConfirmation.cshtml | 0 .../ForgotPasswordConfirmation.cshtml.cs | 0 .../Identity/Pages/Account/Lockout.cshtml | 0 .../Identity/Pages/Account/Lockout.cshtml.cs | 0 .../Areas/Identity/Pages/Account/Login.cshtml | 0 .../Identity/Pages/Account/Login.cshtml.cs | 0 .../Pages/Account/LoginWith2fa.cshtml | 0 .../Pages/Account/LoginWith2fa.cshtml.cs | 0 .../Account/LoginWithRecoveryCode.cshtml | 0 .../Account/LoginWithRecoveryCode.cshtml.cs | 0 .../Identity/Pages/Account/Logout.cshtml | 0 .../Identity/Pages/Account/Logout.cshtml.cs | 0 .../Account/Manage/ChangePassword.cshtml | 0 .../Account/Manage/ChangePassword.cshtml.cs | 0 .../Account/Manage/DeletePersonalData.cshtml | 0 .../Manage/DeletePersonalData.cshtml.cs | 0 .../Pages/Account/Manage/Disable2fa.cshtml | 0 .../Pages/Account/Manage/Disable2fa.cshtml.cs | 0 .../Manage/DownloadPersonalData.cshtml | 0 .../Manage/DownloadPersonalData.cshtml.cs | 0 .../Account/Manage/EnableAuthenticator.cshtml | 0 .../Manage/EnableAuthenticator.cshtml.cs | 0 .../Account/Manage/ExternalLogins.cshtml | 0 .../Account/Manage/ExternalLogins.cshtml.cs | 0 .../Manage/GenerateRecoveryCodes.cshtml | 0 .../Manage/GenerateRecoveryCodes.cshtml.cs | 0 .../Pages/Account/Manage/Index.cshtml | 0 .../Pages/Account/Manage/Index.cshtml.cs | 0 .../Pages/Account/Manage/ManageNavPages.cs | 0 .../Pages/Account/Manage/PersonalData.cshtml | 0 .../Account/Manage/PersonalData.cshtml.cs | 0 .../Account/Manage/ResetAuthenticator.cshtml | 0 .../Manage/ResetAuthenticator.cshtml.cs | 0 .../Pages/Account/Manage/SetPassword.cshtml | 0 .../Account/Manage/SetPassword.cshtml.cs | 0 .../Account/Manage/ShowRecoveryCodes.cshtml | 0 .../Manage/ShowRecoveryCodes.cshtml.cs | 0 .../Manage/TwoFactorAuthentication.cshtml | 0 .../Manage/TwoFactorAuthentication.cshtml.cs | 0 .../Pages/Account/Manage/_Layout.cshtml | 0 .../Pages/Account/Manage/_ManageNav.cshtml | 0 .../Account/Manage/_StatusMessage.cshtml | 0 .../Pages/Account/Manage/_ViewImports.cshtml | 0 .../Pages/Account/Manage/_ViewStart.cshtml | 0 .../Identity/Pages/Account/Register.cshtml | 0 .../Identity/Pages/Account/Register.cshtml.cs | 0 .../Pages/Account/ResetPassword.cshtml | 0 .../Pages/Account/ResetPassword.cshtml.cs | 0 .../Account/ResetPasswordConfirmation.cshtml | 0 .../ResetPasswordConfirmation.cshtml.cs | 0 .../Pages/Account/_ViewImports.cshtml | 0 .../UI/src}/Areas/Identity/Pages/Error.cshtml | 0 .../src}/Areas/Identity/Pages/Error.cshtml.cs | 0 .../src}/Areas/Identity/Pages/_Layout.cshtml | 0 .../Pages/_ValidationScriptsPartial.cshtml | 0 .../Areas/Identity/Pages/_ViewImports.cshtml | 0 .../Areas/Identity/Pages}/_ViewStart.cshtml | 0 .../Areas/Identity/Services/EmailSender.cs | 0 .../Areas/Identity/Services/IEmailSender.cs | 0 .../UI/src}/IdentityBuilderUIExtensions.cs | 0 .../UI/src}/IdentityDefaultUIAttribute.cs | 0 .../src}/IdentityDefaultUIConfigureOptions.cs | 0 .../UI/src}/IdentityPageModelConvention.cs | 0 .../IdentityServiceCollectionUIExtensions.cs | 0 .../Microsoft.AspNetCore.Identity.UI.csproj | 24 +- .../UI/src}/THIRD-PARTY-NOTICES | 0 .../UI/src}/baseline.netcore.json | 0 .../UI/src/wwwroot/Identity}/css/site.css | 0 .../UI/src/wwwroot/Identity}/css/site.min.css | 0 .../UI/src/wwwroot/Identity}/js/site.js | 0 .../UI/src/wwwroot/Identity}/js/site.min.js | 0 .../Identity/lib/bootstrap/.bower.json | 0 .../wwwroot/Identity/lib/bootstrap/LICENSE | 0 .../bootstrap/dist/css/bootstrap-theme.css | 0 .../dist/css/bootstrap-theme.css.map | 0 .../dist/css/bootstrap-theme.min.css | 0 .../dist/css/bootstrap-theme.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.min.css | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../lib/bootstrap/dist/js/bootstrap.js | 0 .../lib/bootstrap/dist/js/bootstrap.min.js | 0 .../Identity/lib/bootstrap/dist/js/npm.js | 0 .../jquery-validation-unobtrusive/.bower.json | 0 .../jquery-validation-unobtrusive/LICENSE.txt | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../lib/jquery-validation/.bower.json | 0 .../Identity/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../dist/additional-methods.min.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../dist/jquery.validate.min.js | 0 .../wwwroot/Identity/lib/jquery/.bower.json | 0 .../wwwroot/Identity/lib/jquery/LICENSE.txt | 0 .../Identity/lib/jquery/dist/jquery.js | 0 .../Identity/lib/jquery/dist/jquery.min.js | 0 .../Identity/lib/jquery/dist/jquery.min.map | 0 .../Pages/Account/Manage/Index.cshtml | 0 .../Pages/Account/Manage/Index.cshtml.cs | 0 .../Identity/Pages/Account/Register.cshtml | 0 .../Identity/Pages/Account/Register.cshtml.cs | 0 .../Areas/Identity/Pages/_ViewImports.cshtml | 0 .../Areas/Identity/Pages/_ViewStart.cshtml | 0 .../Controllers/HomeController.cs | 0 .../Data/ApplicationDbContext.cs | 0 .../Data/ApplicationUser.cs | 0 ...126174859_CreateIdentitySchema.Designer.cs | 0 .../20180126174859_CreateIdentitySchema.cs | 0 .../ApplicationDbContextModelSnapshot.cs | 0 .../IdentitySample.DefaultUI.csproj | 32 + .../IdentitySample.DefaultUI/Program.cs | 0 .../IdentitySample.DefaultUI/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/Shared/_LoginPartial.cshtml | 0 .../Shared/_ValidationScriptsPartial.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../IdentitySample.DefaultUI/appsettings.json | 0 .../IdentitySample.DefaultUI/web.Debug.config | 0 .../web.Release.config | 0 .../IdentitySample.DefaultUI/web.config | 0 .../wwwroot}/css/site.css | 0 .../wwwroot}/css/site.min.css | 0 .../wwwroot/favicon.ico | Bin .../wwwroot}/js/site.js | 0 .../wwwroot}/js/site.min.js | 0 .../Controllers/AccountController.cs | 0 .../Controllers/HomeController.cs | 0 .../Controllers/ManageController.cs | 0 .../IdentitySample.Mvc/CopyAspNetLoader.cmd | 0 ...000000000_CreateIdentitySchema.Designer.cs | 0 .../00000000000000_CreateIdentitySchema.cs | 0 .../ApplicationDbContextModelSnapshot.cs | 0 .../IdentitySample.Mvc.csproj | 31 + .../IdentitySample.Mvc/MessageServices.cs | 0 .../ExternalLoginConfirmationViewModel.cs | 0 .../ForgotPasswordViewModel.cs | 0 .../AccountViewModels/LoginViewModel.cs | 0 .../AccountViewModels/RegisterViewModel.cs | 0 .../ResetPasswordViewModel.cs | 0 .../AccountViewModels/SendCodeViewModel.cs | 0 .../UseRecoveryCodeViewModel.cs | 0 .../VerifyAuthenticatorCodeViewModel.cs | 0 .../AccountViewModels/VerifyCodeViewModel.cs | 0 .../Models/ApplicationDbContext.cs | 0 .../Models/ApplicationUser.cs | 0 .../AddPhoneNumberViewModel.cs | 0 .../ChangePasswordViewModel.cs | 0 .../ConfigureTwoFactorViewModel.cs | 0 .../DisplayRecoveryCodesViewModel.cs | 0 .../ManageViewModels/FactorViewModel.cs | 0 .../Models/ManageViewModels/IndexViewModel.cs | 0 .../ManageViewModels/ManageLoginsViewModel.cs | 0 .../ManageViewModels/RemoveLoginViewModel.cs | 0 .../ManageViewModels/SetPasswordViewModel.cs | 0 .../VerifyPhoneNumberViewModel.cs | 0 .../samples/IdentitySample.Mvc/Program.cs | 0 .../Services/IEmailSender.cs | 0 .../IdentitySample.Mvc/Services/ISmsSender.cs | 0 .../Services/MessageServices.cs | 0 .../samples/IdentitySample.Mvc/Startup.cs | 0 .../Views/Account/ConfirmEmail.cshtml | 0 .../Account/ExternalLoginConfirmation.cshtml | 0 .../Views/Account/ExternalLoginFailure.cshtml | 0 .../Views/Account/ForgotPassword.cshtml | 0 .../Account/ForgotPasswordConfirmation.cshtml | 0 .../Views/Account/Lockout.cshtml | 0 .../Views/Account/Login.cshtml | 0 .../Views/Account/Register.cshtml | 0 .../Views/Account/ResetPassword.cshtml | 0 .../Account/ResetPasswordConfirmation.cshtml | 0 .../Views/Account/SendCode.cshtml | 0 .../Views/Account/UseRecoveryCode.cshtml | 0 .../Account/VerifyAuthenticatorCode.cshtml | 0 .../Views/Account/VerifyCode.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Manage/AddPhoneNumber.cshtml | 0 .../Views/Manage/ChangePassword.cshtml | 0 .../Views/Manage/DisplayRecoveryCodes.cshtml | 0 .../Views/Manage/Index.cshtml | 0 .../Views/Manage/ManageLogins.cshtml | 0 .../Views/Manage/SetPassword.cshtml | 0 .../Views/Manage/VerifyPhoneNumber.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/Shared/_LoginPartial.cshtml | 0 .../Shared/_ValidationScriptsPartial.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views}/_ViewStart.cshtml | 0 .../IdentitySample.Mvc/appsettings.json | 0 .../IdentitySample.Mvc/web.Debug.config | 0 .../IdentitySample.Mvc/web.Release.config | 0 .../samples/IdentitySample.Mvc/web.config | 0 .../IdentitySample.Mvc/wwwroot/css/site.css | 0 .../IdentitySample.Mvc/wwwroot/favicon.ico | Bin .../IdentitySample.Mvc/wwwroot/js/site.js | 0 .../samples/NativeWPFClient/App.config | 0 .../samples/NativeWPFClient/App.xaml | 0 .../samples/NativeWPFClient/App.xaml.cs | 0 .../samples/NativeWPFClient/MainWindow.xaml | 0 .../NativeWPFClient/MainWindow.xaml.cs | 0 .../NativeWPFClient/NativeWPFClient.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../NativeWPFClient/Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../Properties/Settings.settings | 0 .../ApplicationUserAuthorizationTests.cs | 0 .../ApplicationUserLoginTests.cs | 0 .../ApplicationUserManagementTests.cs | 0 .../ApplicationUserRegistrationTests.cs | 0 .../AuthorizationTests.cs | 0 .../Extensions/HtmlAssert.cs | 0 .../Extensions/HttpClientExtensions.cs | 0 .../Extensions/ResponseAssert.cs | 0 .../IdentityUserAuthorizationTests.cs | 0 .../IdentityUserLoginTests.cs | 0 .../IdentityUserManagementTests.cs | 0 .../IdentityUserRegistrationTests.cs | 0 .../Infrastructure/DefaultUIContext.cs | 0 .../Infrastructure/DefaultUIPage.cs | 0 ...ctionalTestsServiceCollectionExtensions.cs | 0 .../Infrastructure/HtmlPage.cs | 0 .../Infrastructure/HtmlPageContext.cs | 0 .../Infrastructure/ServerFactory.cs | 0 .../Identity.FunctionalTests/LoginTests.cs | 0 .../ManagementTests.cs | 0 ...AspNetCore.Identity.FunctionalTests.csproj | 27 + .../NoIdentityAddedTests.cs | 0 .../Pages/Account/ConfirmEmail.cs | 0 .../Pages/Account/ExternalLogin.cs | 0 .../Pages/Account/ForgotPassword.cs | 0 .../Account/ForgotPasswordConfirmation.cs | 0 .../Pages/Account/Login.cs | 0 .../Pages/Account/LoginWith2fa.cs | 0 .../Pages/Account/LoginWithRecoveryCode.cs | 0 .../Pages/Account/Manage/ChangePassword.cs | 0 .../Pages/Account/Manage/DeleteUser.cs | 0 .../Account/Manage/EnableAuthenticator.cs | 0 .../Pages/Account/Manage/Index.cs | 0 .../Pages/Account/Manage/LinkExternalLogin.cs | 0 .../Account/Manage/ManageExternalLogin.cs | 0 .../Pages/Account/Manage/PersonalData.cs | 0 .../Account/Manage/RemoveExternalLogin.cs | 0 .../Account/Manage/ResetAuthenticator.cs | 0 .../Pages/Account/Manage/SetPassword.cs | 0 .../Pages/Account/Manage/ShowRecoveryCodes.cs | 0 .../Account/Manage/TwoFactorAuthentication.cs | 0 .../Pages/Account/Register.cs | 0 .../Pages/Account/ResetPassword.cs | 0 .../Account/ResetPasswordConfirmation.cs | 0 .../Pages/Contoso/Login.cs | 0 .../Identity.FunctionalTests/Pages/Index.cs | 0 .../PocoUserAuthorizationTests.cs | 0 .../PocoUserTests/PocoUserLoginTests.cs | 0 .../PocoUserTests/PocoUserManagementTests.cs | 0 .../PocoUserRegistrationTests.cs | 0 .../RegistrationTests.cs | 0 .../Identity.FunctionalTests/UserStories.cs | 0 .../xunit.runner.json | 0 .../test/Identity.Test/ApiConsistencyTest.cs | 0 .../Identity.Test/CdnScriptTaghelperTests.cs | 2 +- .../test/Identity.Test/IdentityBuilderTest.cs | 0 .../test/Identity.Test/IdentityOptionsTest.cs | 0 .../test/Identity.Test/IdentityResultTest.cs | 0 .../Microsoft.AspNetCore.Identity.Test.csproj | 20 + .../test/Identity.Test/NoopRoleStore.cs | 0 .../test/Identity.Test/NoopUserStore.cs | 0 .../test/Identity.Test/PasswordHasherTest.cs | 0 .../Identity.Test/PasswordValidatorTest.cs | 0 .../Identity.Test/PrincipalExtensionsTest.cs | 0 .../test/Identity.Test/RoleManagerTest.cs | 0 .../test/Identity.Test/RoleValidatorTest.cs | 0 .../SecurityStampValidatorTest.cs | 0 .../test/Identity.Test/SignInManagerTest.cs | 0 .../UserClaimsPrincipalFactoryTest.cs | 0 .../test/Identity.Test/UserManagerTest.cs | 0 .../test/Identity.Test/UserValidatorTest.cs | 0 .../test/InMemory.Test/ControllerTest.cs | 0 .../test/InMemory.Test/FunctionalTest.cs | 0 .../test/InMemory.Test/InMemoryStore.cs | 0 .../test/InMemory.Test/InMemoryStoreTest.cs | 0 .../test/InMemory.Test/InMemoryUserStore.cs | 0 .../InMemory.Test/InMemoryUserStoreTest.cs | 0 ...t.AspNetCore.Identity.InMemory.Test.csproj | 19 + .../test/InMemory.Test/TestClock.cs | 0 .../ApplicationUserStartup.cs | 0 .../Data/ApplicationDbContext.cs | 0 .../Data/ApplicationUser.cs | 0 ...000000000_CreateIdentitySchema.Designer.cs | 0 .../00000000000000_CreateIdentitySchema.cs | 0 ...217170630_UpdateIdentitySchema.Designer.cs | 0 .../20180217170630_UpdateIdentitySchema.cs | 0 .../IdentityDbContextModelSnapshot.cs | 0 .../Identity.DefaultUI.WebSite.csproj | 44 + .../NoIdentityStartup.cs | 0 .../Pages/About.cshtml | 0 .../Pages/About.cshtml.cs | 0 .../Pages/Contact.cshtml | 0 .../Pages/Contact.cshtml.cs | 0 .../Pages/Contoso/Login.cshtml | 0 .../Pages/Contoso/Login.cshtml.cs | 0 .../Pages/Error.cshtml | 0 .../Pages/Error.cshtml.cs | 0 .../Pages/Index.cshtml | 0 .../Pages/Index.cshtml.cs | 0 .../Pages/Privacy.cshtml | 0 .../Pages/Privacy.cshtml.cs | 0 .../Pages/Shared/_LoginPartial.cshtml | 0 .../Pages/_CookieConsentPartial.cshtml | 0 .../Pages/_Layout.cshtml | 0 .../Pages/_ValidationScriptsPartial.cshtml | 0 .../Pages/_ViewImports.cshtml | 0 .../Pages/_ViewStart.cshtml | 0 .../Identity.DefaultUI.WebSite/PocoUser.cs | 0 .../PocoUserStartup.cs | 0 .../Identity.DefaultUI.WebSite/Program.cs | 0 .../ContosoAuthenticationBuilderExtensions.cs | 0 .../ContosoAuthenticationConstants.cs | 0 .../Services/ContosoAuthenticationHandler.cs | 0 .../Services/ContosoAuthenticationOptions.cs | 0 .../Services/ContosoEmailSender.cs | 0 .../Services/IdentityEmail.cs | 0 .../Identity.DefaultUI.WebSite/Startup.cs | 0 .../Identity.DefaultUI.WebSite/StartupBase.cs | 0 .../appsettings.Development.json | 0 .../appsettings.json | 0 .../bundleconfig.json | 0 .../wwwroot/css/site.css | 0 .../wwwroot/css/site.min.css | 0 .../wwwroot/favicon.ico | Bin .../wwwroot/images/banner1.svg | 0 .../wwwroot/images/banner2.svg | 0 .../wwwroot/images/banner3.svg | 0 .../wwwroot/images/banner4.svg | 0 .../wwwroot/js/site.js | 0 .../wwwroot/js/site.min.js | 0 .../wwwroot/lib/bootstrap/.bower.json | 0 .../wwwroot/lib/bootstrap/LICENSE | 0 .../bootstrap/dist/css/bootstrap-theme.css | 0 .../dist/css/bootstrap-theme.css.map | 0 .../dist/css/bootstrap-theme.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../lib/bootstrap/dist/js/bootstrap.js | 0 .../wwwroot/lib/bootstrap/dist/js/npm.js | 0 .../jquery-validation-unobtrusive/.bower.json | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../wwwroot/lib/jquery-validation/.bower.json | 0 .../wwwroot/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../wwwroot/lib/jquery/.bower.json | 0 .../wwwroot/lib/jquery/LICENSE.txt | 0 .../wwwroot/lib/jquery/dist/jquery.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.map | 0 src/Identity/IdentityCore.sln | 918 ++++++++++++----- src/Identity/NuGetPackageVerifier.json | 17 - .../Shared/ApiConsistencyTestBase.cs | 0 src/Identity/{test => }/Shared/MockHelpers.cs | 0 src/Identity/{test => }/Shared/PocoRole.cs | 0 .../{test => }/Shared/PocoRoleClaim.cs | 0 src/Identity/{test => }/Shared/PocoUser.cs | 0 .../{test => }/Shared/PocoUserClaim.cs | 0 .../{test => }/Shared/PocoUserLogin.cs | 0 .../{test => }/Shared/PocoUserRole.cs | 0 .../{test => }/Shared/PocoUserToken.cs | 0 .../{test => }/Shared/PriorityOrderer.cs | 0 src/Identity/build/Key.snk | Bin 596 -> 0 bytes src/Identity/build/dependencies.props | 79 -- src/Identity/build/repo.props | 13 - src/Identity/build/repo.targets | 8 - src/Identity/build/sources.props | 17 - .../IdentitySample.DefaultUI.csproj | 35 - .../Properties/launchSettings.json | 25 - .../IdentitySample.Mvc.csproj | 34 - .../Properties/launchSettings.json | 25 - .../src/AspNetCoreCompat/CookieInterop.cs | 21 - .../src/AspNetCoreCompat/IdentityDbContext.cs | 140 --- .../src/AspNetCoreCompat/IdentityRole.cs | 50 - .../src/AspNetCoreCompat/IdentityRoleClaim.cs | 35 - .../src/AspNetCoreCompat/IdentityUser.cs | 62 -- .../src/AspNetCoreCompat/IdentityUserLogin.cs | 19 - ...ft.AspNet.Identity.AspNetCoreCompat.csproj | 21 - .../src/AspNetCoreCompat/UserStore.cs | 50 - .../baseline.netframework.json | 887 ----------------- src/Identity/src/Directory.Build.props | 7 - ...etCore.Identity.Specification.Tests.csproj | 23 - src/Identity/test/Directory.Build.props | 20 - ...y.EntityFrameworkCore.InMemory.Test.csproj | 23 - ...e.Identity.EntityFrameworkCore.Test.csproj | 29 - ...AspNetCore.Identity.FunctionalTests.csproj | 28 - .../Microsoft.AspNetCore.Identity.Test.csproj | 23 - ...t.AspNetCore.Identity.InMemory.Test.csproj | 22 - .../test/WebSites/Directory.Build.props | 11 - .../Identity.DefaultUI.WebSite.csproj | 48 - .../Properties/launchSettings.json | 28 - src/Identity/version.props | 18 - 584 files changed, 1507 insertions(+), 2622 deletions(-) delete mode 100644 src/Identity/.gitignore delete mode 100644 src/Identity/Directory.Build.props delete mode 100644 src/Identity/Directory.Build.targets rename src/Identity/{src/EF => EF/src}/IdentityDbContext.cs (100%) rename src/Identity/{src/EF => EF/src}/IdentityEntityFrameworkBuilderExtensions.cs (100%) rename src/Identity/{src/EF => EF/src}/IdentityUserContext.cs (100%) rename src/Identity/{src/EF => EF/src}/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj (54%) rename src/Identity/{src/EF => EF/src}/Properties/Resources.Designer.cs (100%) rename src/Identity/{src/EF => EF/src}/Resources.resx (100%) rename src/Identity/{src/EF => EF/src}/RoleStore.cs (100%) rename src/Identity/{src/EF => EF/src}/UserOnlyStore.cs (100%) rename src/Identity/{src/EF => EF/src}/UserStore.cs (100%) rename src/Identity/{src/EF => EF/src}/baseline.netcore.json (100%) rename src/Identity/{ => EF}/test/EF.InMemory.Test/InMemoryContext.cs (100%) rename src/Identity/{ => EF}/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs (100%) rename src/Identity/{ => EF}/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs (100%) rename src/Identity/{ => EF}/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs (100%) create mode 100644 src/Identity/EF/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj rename src/Identity/{ => EF}/test/EF.InMemory.Test/RoleStoreTest.cs (100%) rename src/Identity/{ => EF}/test/EF.InMemory.Test/TestIdentityFactory.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/ApiConsistencyTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/CustomPocoTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/DbUtil.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/DefaultPocoTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/MaxKeyLengthSchemaTest.cs (100%) create mode 100644 src/Identity/EF/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj rename src/Identity/{ => EF}/test/EF.Test/SqlStoreOnlyUsersTestBase.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/SqlStoreTestBase.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/UserOnlyCustomContextTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/UserOnlyTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/UserStoreEncryptPersonalDataTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/UserStoreGuidKeyTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/UserStoreIntKeyTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/UserStoreStringKeyTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/UserStoreTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/UserStoreWithGenericsTest.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/Utilities/ScratchDatabaseFixture.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/Utilities/SqlServerTestStore.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/Utilities/TestEnvironment.cs (100%) rename src/Identity/{ => EF}/test/EF.Test/config.json (100%) rename src/Identity/{src/Core => Extensions/Core/src}/AuthenticatorTokenProvider.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/Base32.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/ClaimsIdentityOptions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/DefaultPersonalDataProtector.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/EmailTokenProvider.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/ILookupNormalizer.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/ILookupProtector.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/ILookupProtectorKeyRing.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IPasswordHasher.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IPasswordValidator.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IPersonalDataProtector.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IProtectedUserStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IQueryableRoleStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IQueryableUserStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IRoleClaimStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IRoleStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IRoleValidator.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserAuthenticationTokenStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserAuthenticatorKeyStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserClaimStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserClaimsPrincipalFactory.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserEmailStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserLockoutStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserLoginStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserPasswordStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserPhoneNumberStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserRoleStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserSecurityStampStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserTwoFactorRecoveryCodeStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserTwoFactorStore.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserTwoFactorTokenProvider.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IUserValidator.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IdentityBuilder.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IdentityError.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IdentityErrorDescriber.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IdentityOptions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IdentityResult.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/IdentityServiceCollectionExtensions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/LockoutOptions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/Microsoft.Extensions.Identity.Core.csproj (53%) rename src/Identity/{src/Core => Extensions/Core/src}/PasswordHasher.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/PasswordHasherCompatibilityMode.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/PasswordHasherOptions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/PasswordOptions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/PasswordValidator.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/PasswordVerificationResult.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/PersonalDataAttribute.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/PhoneNumberTokenProvider.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/PrincipalExtensions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/Properties/AssemblyInfo.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/Properties/Resources.Designer.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/ProtectedPersonalDataAttribute.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/Resources.resx (100%) rename src/Identity/{src/Core => Extensions/Core/src}/Rfc6238AuthenticationService.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/RoleManager.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/RoleValidator.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/SignInOptions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/SignInResult.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/StoreOptions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/TokenOptions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/TokenProviderDescriptor.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/TotpSecurityStampBasedTokenProvider.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/UpperInvariantLookupNormalizer.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/UserClaimsPrincipalFactory.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/UserLoginInfo.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/UserManager.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/UserOptions.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/UserValidator.cs (100%) rename src/Identity/{src/Core => Extensions/Core/src}/baseline.netcore.json (100%) rename src/Identity/{src/Stores => Extensions/Stores/src}/IdentityRole.cs (100%) rename src/Identity/{src/Stores => Extensions/Stores/src}/IdentityRoleClaim.cs (100%) rename src/Identity/{src/Stores => Extensions/Stores/src}/IdentityUser.cs (100%) rename src/Identity/{src/Stores => Extensions/Stores/src}/IdentityUserClaim.cs (100%) rename src/Identity/{src/Stores => Extensions/Stores/src}/IdentityUserLogin.cs (100%) rename src/Identity/{src/Stores => Extensions/Stores/src}/IdentityUserRole.cs (100%) rename src/Identity/{src/Stores => Extensions/Stores/src}/IdentityUserToken.cs (100%) rename src/Identity/{src/Stores => Extensions/Stores/src}/Microsoft.Extensions.Identity.Stores.csproj (62%) rename src/Identity/{src/Stores => Extensions/Stores/src}/RoleStoreBase.cs (100%) rename src/Identity/{src/Stores => Extensions/Stores/src}/UserStoreBase.cs (100%) rename src/Identity/{src/Stores => Extensions/Stores/src}/baseline.netcore.json (100%) rename src/Identity/{src/Identity => Identity/Core/src}/AspNetRoleManager.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/AspNetUserManager.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/BuilderExtensions.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/DataProtectionTokenProvider.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/DataProtectionTokenProviderOptions.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/ExternalLoginInfo.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/ISecurityStampValidator.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/ITwoFactorSecurityStampValidator.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/IdentityBuilderExtensions.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/IdentityConstants.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/IdentityCookiesBuilder.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/IdentityCookiesBuilderExtensions.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/IdentityServiceCollectionExtensions.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/Microsoft.AspNetCore.Identity.csproj (51%) rename src/Identity/{src/Identity => Identity/Core/src}/Properties/AssemblyInfo.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/Properties/Resources.Designer.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/Properties/debugSettings.json (100%) rename src/Identity/{src/Identity => Identity/Core/src}/Resources.resx (100%) rename src/Identity/{src/Identity => Identity/Core/src}/SecurityStampRefreshingPrincipalContext.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/SecurityStampValidator.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/SecurityStampValidatorOptions.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/SignInManager.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/TwoFactorSecurityStampValidator.cs (100%) rename src/Identity/{src/Identity => Identity/Core/src}/baseline.netcore.json (100%) rename src/Identity/{src/Identity => Identity/Core/src}/baseline.netframework.json (100%) rename src/Identity/{ => Identity}/README.md (83%) rename src/Identity/{src/Specification.Tests => Identity/Specification.Tests/src}/IdentityResultAssert.cs (100%) rename src/Identity/{src/Specification.Tests => Identity/Specification.Tests/src}/IdentitySpecificationTestBase.cs (100%) create mode 100644 src/Identity/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj rename src/Identity/{src/Specification.Tests => Identity/Specification.Tests/src}/TestLogger.cs (100%) rename src/Identity/{src/Specification.Tests => Identity/Specification.Tests/src}/UserManagerSpecificationTests.cs (100%) rename src/Identity/{src/Specification.Tests => Identity/Specification.Tests/src}/baseline.netcore.json (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Filters/ExternalLoginsPageFilter.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/AccessDenied.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ConfirmEmail.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ExternalLogin.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ForgotPassword.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Lockout.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Lockout.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Login.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Login.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/LoginWith2fa.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Logout.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Logout.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/Index.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/_Layout.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Register.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/Register.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ResetPassword.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Account/_ViewImports.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Error.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/Error.cshtml.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/_Layout.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Pages/_ViewImports.cshtml (100%) rename src/Identity/{samples/IdentitySample.DefaultUI/Views => Identity/UI/src/Areas/Identity/Pages}/_ViewStart.cshtml (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Services/EmailSender.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Areas/Identity/Services/IEmailSender.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/IdentityBuilderUIExtensions.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/IdentityDefaultUIAttribute.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/IdentityDefaultUIConfigureOptions.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/IdentityPageModelConvention.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/IdentityServiceCollectionUIExtensions.cs (100%) rename src/Identity/{src/UI => Identity/UI/src}/Microsoft.AspNetCore.Identity.UI.csproj (76%) rename src/Identity/{src/UI => Identity/UI/src}/THIRD-PARTY-NOTICES (100%) rename src/Identity/{src/UI => Identity/UI/src}/baseline.netcore.json (100%) rename src/Identity/{samples/IdentitySample.DefaultUI/wwwroot => Identity/UI/src/wwwroot/Identity}/css/site.css (100%) rename src/Identity/{samples/IdentitySample.DefaultUI/wwwroot => Identity/UI/src/wwwroot/Identity}/css/site.min.css (100%) rename src/Identity/{samples/IdentitySample.DefaultUI/wwwroot => Identity/UI/src/wwwroot/Identity}/js/site.js (100%) rename src/Identity/{samples/IdentitySample.DefaultUI/wwwroot => Identity/UI/src/wwwroot/Identity}/js/site.min.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/.bower.json (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/LICENSE (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/bootstrap/dist/js/npm.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery-validation/.bower.json (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery-validation/LICENSE.md (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery/.bower.json (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery/LICENSE.txt (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery/dist/jquery.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery/dist/jquery.min.js (100%) rename src/Identity/{src/UI => Identity/UI/src}/wwwroot/Identity/lib/jquery/dist/jquery.min.map (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewStart.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Controllers/HomeController.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Data/ApplicationDbContext.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Data/ApplicationUser.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs (100%) create mode 100644 src/Identity/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Program.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Startup.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Views/Home/Index.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml (100%) rename src/Identity/{samples/IdentitySample.Mvc => Identity/samples/IdentitySample.DefaultUI}/Views/_ViewStart.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/appsettings.json (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/web.Debug.config (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/web.Release.config (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/web.config (100%) rename src/Identity/{src/UI/wwwroot/Identity => Identity/samples/IdentitySample.DefaultUI/wwwroot}/css/site.css (100%) rename src/Identity/{src/UI/wwwroot/Identity => Identity/samples/IdentitySample.DefaultUI/wwwroot}/css/site.min.css (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.DefaultUI/wwwroot/favicon.ico (100%) rename src/Identity/{src/UI/wwwroot/Identity => Identity/samples/IdentitySample.DefaultUI/wwwroot}/js/site.js (100%) rename src/Identity/{src/UI/wwwroot/Identity => Identity/samples/IdentitySample.DefaultUI/wwwroot}/js/site.min.js (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Controllers/AccountController.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Controllers/HomeController.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Controllers/ManageController.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs (100%) create mode 100644 src/Identity/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/MessageServices.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/AccountViewModels/LoginViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/AccountViewModels/RegisterViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/AccountViewModels/ResetPasswordViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/AccountViewModels/UseRecoveryCodeViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyAuthenticatorCodeViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyCodeViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ApplicationUser.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ManageViewModels/AddPhoneNumberViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ManageViewModels/ChangePasswordViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ManageViewModels/DisplayRecoveryCodesViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ManageViewModels/FactorViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ManageViewModels/RemoveLoginViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ManageViewModels/SetPasswordViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Program.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Services/IEmailSender.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Services/ISmsSender.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Services/MessageServices.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Startup.cs (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/Lockout.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/Login.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/Register.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/ResetPasswordConfirmation.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Home/Index.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Manage/SetPassword.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml (100%) rename src/Identity/{src/UI/Areas/Identity/Pages => Identity/samples/IdentitySample.Mvc/Views}/_ViewStart.cshtml (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/appsettings.json (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/web.Debug.config (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/web.Release.config (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/web.config (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/wwwroot/css/site.css (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/wwwroot/favicon.ico (100%) rename src/Identity/{ => Identity}/samples/IdentitySample.Mvc/wwwroot/js/site.js (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/App.config (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/App.xaml (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/App.xaml.cs (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/MainWindow.xaml (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/MainWindow.xaml.cs (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/NativeWPFClient.csproj (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/Properties/AssemblyInfo.cs (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/Properties/Resources.Designer.cs (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/Properties/Resources.resx (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/Properties/Settings.Designer.cs (100%) rename src/Identity/{ => Identity}/samples/NativeWPFClient/Properties/Settings.settings (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserAuthorizationTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserLoginTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserManagementTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserRegistrationTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/AuthorizationTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Extensions/HtmlAssert.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Extensions/HttpClientExtensions.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Extensions/ResponseAssert.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserAuthorizationTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserLoginTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserManagementTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserRegistrationTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Infrastructure/DefaultUIPage.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Infrastructure/HtmlPage.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Infrastructure/HtmlPageContext.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/LoginTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/ManagementTests.cs (100%) create mode 100644 src/Identity/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/NoIdentityAddedTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/ConfirmEmail.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/ForgotPassword.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/ForgotPasswordConfirmation.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Login.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/LoginWith2fa.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/LoginWithRecoveryCode.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/ChangePassword.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/DeleteUser.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/EnableAuthenticator.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/LinkExternalLogin.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/ManageExternalLogin.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/PersonalData.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/RemoveExternalLogin.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/ResetAuthenticator.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/SetPassword.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/ShowRecoveryCodes.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Manage/TwoFactorAuthentication.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/Register.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/ResetPassword.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Account/ResetPasswordConfirmation.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Contoso/Login.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/Pages/Index.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/PocoUserTests/PocoUserAuthorizationTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/PocoUserTests/PocoUserLoginTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/PocoUserTests/PocoUserManagementTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/PocoUserTests/PocoUserRegistrationTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/RegistrationTests.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/UserStories.cs (100%) rename src/Identity/{ => Identity}/test/Identity.FunctionalTests/xunit.runner.json (100%) rename src/Identity/{ => Identity}/test/Identity.Test/ApiConsistencyTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/CdnScriptTaghelperTests.cs (98%) rename src/Identity/{ => Identity}/test/Identity.Test/IdentityBuilderTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/IdentityOptionsTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/IdentityResultTest.cs (100%) create mode 100644 src/Identity/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj rename src/Identity/{ => Identity}/test/Identity.Test/NoopRoleStore.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/NoopUserStore.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/PasswordHasherTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/PasswordValidatorTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/PrincipalExtensionsTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/RoleManagerTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/RoleValidatorTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/SecurityStampValidatorTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/SignInManagerTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/UserManagerTest.cs (100%) rename src/Identity/{ => Identity}/test/Identity.Test/UserValidatorTest.cs (100%) rename src/Identity/{ => Identity}/test/InMemory.Test/ControllerTest.cs (100%) rename src/Identity/{ => Identity}/test/InMemory.Test/FunctionalTest.cs (100%) rename src/Identity/{ => Identity}/test/InMemory.Test/InMemoryStore.cs (100%) rename src/Identity/{ => Identity}/test/InMemory.Test/InMemoryStoreTest.cs (100%) rename src/Identity/{ => Identity}/test/InMemory.Test/InMemoryUserStore.cs (100%) rename src/Identity/{ => Identity}/test/InMemory.Test/InMemoryUserStoreTest.cs (100%) create mode 100644 src/Identity/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj rename src/Identity/{ => Identity}/test/InMemory.Test/TestClock.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs (100%) create mode 100644 src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/NoIdentityStartup.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/About.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Contact.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Error.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Index.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/_CookieConsentPartial.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/PocoUser.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/PocoUserStartup.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Program.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/Startup.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/StartupBase.cs (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/appsettings.Development.json (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/appsettings.json (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/bundleconfig.json (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/css/site.css (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/css/site.min.css (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/favicon.ico (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/images/banner1.svg (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/images/banner2.svg (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/images/banner3.svg (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/images/banner4.svg (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/js/site.js (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/js/site.min.js (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/.bower.json (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/.bower.json (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/.bower.json (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/.bower.json (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js (100%) rename src/Identity/{test/WebSites => Identity/testassets}/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map (100%) delete mode 100644 src/Identity/NuGetPackageVerifier.json rename src/Identity/{test => }/Shared/ApiConsistencyTestBase.cs (100%) rename src/Identity/{test => }/Shared/MockHelpers.cs (100%) rename src/Identity/{test => }/Shared/PocoRole.cs (100%) rename src/Identity/{test => }/Shared/PocoRoleClaim.cs (100%) rename src/Identity/{test => }/Shared/PocoUser.cs (100%) rename src/Identity/{test => }/Shared/PocoUserClaim.cs (100%) rename src/Identity/{test => }/Shared/PocoUserLogin.cs (100%) rename src/Identity/{test => }/Shared/PocoUserRole.cs (100%) rename src/Identity/{test => }/Shared/PocoUserToken.cs (100%) rename src/Identity/{test => }/Shared/PriorityOrderer.cs (100%) delete mode 100644 src/Identity/build/Key.snk delete mode 100644 src/Identity/build/dependencies.props delete mode 100644 src/Identity/build/repo.props delete mode 100644 src/Identity/build/repo.targets delete mode 100644 src/Identity/build/sources.props delete mode 100644 src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj delete mode 100644 src/Identity/samples/IdentitySample.DefaultUI/Properties/launchSettings.json delete mode 100644 src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj delete mode 100644 src/Identity/samples/IdentitySample.Mvc/Properties/launchSettings.json delete mode 100644 src/Identity/src/AspNetCoreCompat/CookieInterop.cs delete mode 100644 src/Identity/src/AspNetCoreCompat/IdentityDbContext.cs delete mode 100644 src/Identity/src/AspNetCoreCompat/IdentityRole.cs delete mode 100644 src/Identity/src/AspNetCoreCompat/IdentityRoleClaim.cs delete mode 100644 src/Identity/src/AspNetCoreCompat/IdentityUser.cs delete mode 100644 src/Identity/src/AspNetCoreCompat/IdentityUserLogin.cs delete mode 100644 src/Identity/src/AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj delete mode 100644 src/Identity/src/AspNetCoreCompat/UserStore.cs delete mode 100644 src/Identity/src/AspNetCoreCompat/baseline.netframework.json delete mode 100644 src/Identity/src/Directory.Build.props delete mode 100644 src/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj delete mode 100644 src/Identity/test/Directory.Build.props delete mode 100644 src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj delete mode 100644 src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj delete mode 100644 src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj delete mode 100644 src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj delete mode 100644 src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj delete mode 100644 src/Identity/test/WebSites/Directory.Build.props delete mode 100644 src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj delete mode 100644 src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Properties/launchSettings.json delete mode 100644 src/Identity/version.props diff --git a/build/artifacts.props b/build/artifacts.props index 310c2f5d0f..8e693df702 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -22,7 +22,6 @@ - diff --git a/build/buildorder.props b/build/buildorder.props index 31803c24a5..47cc8e8f97 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -8,7 +8,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index 5a3b3c442c..7d8d5ddb53 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -93,7 +93,9 @@ 2.1.1 0.5.1 2.1.4 + 2.1.4 2.1.4 + 2.1.4 0.9.9 diff --git a/build/repo.props b/build/repo.props index 3a93af4b5e..96da90068f 100644 --- a/build/repo.props +++ b/build/repo.props @@ -66,6 +66,10 @@ " Condition=" '$(MSBuildRuntimeType)' == 'Core' " /> + + + + - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 0eed5d0ae8..ed463e7dbb 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -422,6 +422,47 @@ + + + 2.1.6 + + + + + + + + + + 2.1.6 + + + + + + + + + 2.1.6 + + + + + + + + + + + 2.1.6 + + + + + + + + 2.1.1 @@ -927,6 +968,25 @@ + + + 2.1.6 + + + + + + + + + + 2.1.6 + + + + + + 2.1.6 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 9d3e931544..38fee0ed0c 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -53,6 +53,10 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + + + + @@ -101,6 +105,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 6a89badfc4..38a85583c3 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -33,7 +33,9 @@ and are generated based on the last package release. + + @@ -41,6 +43,7 @@ and are generated based on the last package release. + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 059308b49e..bb3a234022 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -35,6 +35,12 @@ + + + + + + diff --git a/src/Identity/.gitignore b/src/Identity/.gitignore deleted file mode 100644 index 22d237f27e..0000000000 --- a/src/Identity/.gitignore +++ /dev/null @@ -1,32 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -*.sln.ide -project.lock.json -.vs -.vscode -.build/ -.testPublish/ -global.json diff --git a/src/Identity/Directory.Build.props b/src/Identity/Directory.Build.props deleted file mode 100644 index f7f18cf416..0000000000 --- a/src/Identity/Directory.Build.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/Identity - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - $(MSBuildThisFileDirectory)..\Shared\ - - - diff --git a/src/Identity/Directory.Build.targets b/src/Identity/Directory.Build.targets deleted file mode 100644 index 53b3f6e1da..0000000000 --- a/src/Identity/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/Identity/src/EF/IdentityDbContext.cs b/src/Identity/EF/src/IdentityDbContext.cs similarity index 100% rename from src/Identity/src/EF/IdentityDbContext.cs rename to src/Identity/EF/src/IdentityDbContext.cs diff --git a/src/Identity/src/EF/IdentityEntityFrameworkBuilderExtensions.cs b/src/Identity/EF/src/IdentityEntityFrameworkBuilderExtensions.cs similarity index 100% rename from src/Identity/src/EF/IdentityEntityFrameworkBuilderExtensions.cs rename to src/Identity/EF/src/IdentityEntityFrameworkBuilderExtensions.cs diff --git a/src/Identity/src/EF/IdentityUserContext.cs b/src/Identity/EF/src/IdentityUserContext.cs similarity index 100% rename from src/Identity/src/EF/IdentityUserContext.cs rename to src/Identity/EF/src/IdentityUserContext.cs diff --git a/src/Identity/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/Identity/EF/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj similarity index 54% rename from src/Identity/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj rename to src/Identity/EF/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj index 79339b9c1e..08ababa087 100644 --- a/src/Identity/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj +++ b/src/Identity/EF/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj @@ -8,12 +8,9 @@ - - - - - - + + + diff --git a/src/Identity/src/EF/Properties/Resources.Designer.cs b/src/Identity/EF/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Identity/src/EF/Properties/Resources.Designer.cs rename to src/Identity/EF/src/Properties/Resources.Designer.cs diff --git a/src/Identity/src/EF/Resources.resx b/src/Identity/EF/src/Resources.resx similarity index 100% rename from src/Identity/src/EF/Resources.resx rename to src/Identity/EF/src/Resources.resx diff --git a/src/Identity/src/EF/RoleStore.cs b/src/Identity/EF/src/RoleStore.cs similarity index 100% rename from src/Identity/src/EF/RoleStore.cs rename to src/Identity/EF/src/RoleStore.cs diff --git a/src/Identity/src/EF/UserOnlyStore.cs b/src/Identity/EF/src/UserOnlyStore.cs similarity index 100% rename from src/Identity/src/EF/UserOnlyStore.cs rename to src/Identity/EF/src/UserOnlyStore.cs diff --git a/src/Identity/src/EF/UserStore.cs b/src/Identity/EF/src/UserStore.cs similarity index 100% rename from src/Identity/src/EF/UserStore.cs rename to src/Identity/EF/src/UserStore.cs diff --git a/src/Identity/src/EF/baseline.netcore.json b/src/Identity/EF/src/baseline.netcore.json similarity index 100% rename from src/Identity/src/EF/baseline.netcore.json rename to src/Identity/EF/src/baseline.netcore.json diff --git a/src/Identity/test/EF.InMemory.Test/InMemoryContext.cs b/src/Identity/EF/test/EF.InMemory.Test/InMemoryContext.cs similarity index 100% rename from src/Identity/test/EF.InMemory.Test/InMemoryContext.cs rename to src/Identity/EF/test/EF.InMemory.Test/InMemoryContext.cs diff --git a/src/Identity/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs b/src/Identity/EF/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs similarity index 100% rename from src/Identity/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs rename to src/Identity/EF/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs diff --git a/src/Identity/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs b/src/Identity/EF/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs similarity index 100% rename from src/Identity/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs rename to src/Identity/EF/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs diff --git a/src/Identity/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs b/src/Identity/EF/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs similarity index 100% rename from src/Identity/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs rename to src/Identity/EF/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs diff --git a/src/Identity/EF/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/src/Identity/EF/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj new file mode 100644 index 0000000000..29d390e994 --- /dev/null +++ b/src/Identity/EF/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj @@ -0,0 +1,20 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + + diff --git a/src/Identity/test/EF.InMemory.Test/RoleStoreTest.cs b/src/Identity/EF/test/EF.InMemory.Test/RoleStoreTest.cs similarity index 100% rename from src/Identity/test/EF.InMemory.Test/RoleStoreTest.cs rename to src/Identity/EF/test/EF.InMemory.Test/RoleStoreTest.cs diff --git a/src/Identity/test/EF.InMemory.Test/TestIdentityFactory.cs b/src/Identity/EF/test/EF.InMemory.Test/TestIdentityFactory.cs similarity index 100% rename from src/Identity/test/EF.InMemory.Test/TestIdentityFactory.cs rename to src/Identity/EF/test/EF.InMemory.Test/TestIdentityFactory.cs diff --git a/src/Identity/test/EF.Test/ApiConsistencyTest.cs b/src/Identity/EF/test/EF.Test/ApiConsistencyTest.cs similarity index 100% rename from src/Identity/test/EF.Test/ApiConsistencyTest.cs rename to src/Identity/EF/test/EF.Test/ApiConsistencyTest.cs diff --git a/src/Identity/test/EF.Test/CustomPocoTest.cs b/src/Identity/EF/test/EF.Test/CustomPocoTest.cs similarity index 100% rename from src/Identity/test/EF.Test/CustomPocoTest.cs rename to src/Identity/EF/test/EF.Test/CustomPocoTest.cs diff --git a/src/Identity/test/EF.Test/DbUtil.cs b/src/Identity/EF/test/EF.Test/DbUtil.cs similarity index 100% rename from src/Identity/test/EF.Test/DbUtil.cs rename to src/Identity/EF/test/EF.Test/DbUtil.cs diff --git a/src/Identity/test/EF.Test/DefaultPocoTest.cs b/src/Identity/EF/test/EF.Test/DefaultPocoTest.cs similarity index 100% rename from src/Identity/test/EF.Test/DefaultPocoTest.cs rename to src/Identity/EF/test/EF.Test/DefaultPocoTest.cs diff --git a/src/Identity/test/EF.Test/MaxKeyLengthSchemaTest.cs b/src/Identity/EF/test/EF.Test/MaxKeyLengthSchemaTest.cs similarity index 100% rename from src/Identity/test/EF.Test/MaxKeyLengthSchemaTest.cs rename to src/Identity/EF/test/EF.Test/MaxKeyLengthSchemaTest.cs diff --git a/src/Identity/EF/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/src/Identity/EF/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj new file mode 100644 index 0000000000..360cd34ba2 --- /dev/null +++ b/src/Identity/EF/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj @@ -0,0 +1,26 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Identity/test/EF.Test/SqlStoreOnlyUsersTestBase.cs b/src/Identity/EF/test/EF.Test/SqlStoreOnlyUsersTestBase.cs similarity index 100% rename from src/Identity/test/EF.Test/SqlStoreOnlyUsersTestBase.cs rename to src/Identity/EF/test/EF.Test/SqlStoreOnlyUsersTestBase.cs diff --git a/src/Identity/test/EF.Test/SqlStoreTestBase.cs b/src/Identity/EF/test/EF.Test/SqlStoreTestBase.cs similarity index 100% rename from src/Identity/test/EF.Test/SqlStoreTestBase.cs rename to src/Identity/EF/test/EF.Test/SqlStoreTestBase.cs diff --git a/src/Identity/test/EF.Test/UserOnlyCustomContextTest.cs b/src/Identity/EF/test/EF.Test/UserOnlyCustomContextTest.cs similarity index 100% rename from src/Identity/test/EF.Test/UserOnlyCustomContextTest.cs rename to src/Identity/EF/test/EF.Test/UserOnlyCustomContextTest.cs diff --git a/src/Identity/test/EF.Test/UserOnlyTest.cs b/src/Identity/EF/test/EF.Test/UserOnlyTest.cs similarity index 100% rename from src/Identity/test/EF.Test/UserOnlyTest.cs rename to src/Identity/EF/test/EF.Test/UserOnlyTest.cs diff --git a/src/Identity/test/EF.Test/UserStoreEncryptPersonalDataTest.cs b/src/Identity/EF/test/EF.Test/UserStoreEncryptPersonalDataTest.cs similarity index 100% rename from src/Identity/test/EF.Test/UserStoreEncryptPersonalDataTest.cs rename to src/Identity/EF/test/EF.Test/UserStoreEncryptPersonalDataTest.cs diff --git a/src/Identity/test/EF.Test/UserStoreGuidKeyTest.cs b/src/Identity/EF/test/EF.Test/UserStoreGuidKeyTest.cs similarity index 100% rename from src/Identity/test/EF.Test/UserStoreGuidKeyTest.cs rename to src/Identity/EF/test/EF.Test/UserStoreGuidKeyTest.cs diff --git a/src/Identity/test/EF.Test/UserStoreIntKeyTest.cs b/src/Identity/EF/test/EF.Test/UserStoreIntKeyTest.cs similarity index 100% rename from src/Identity/test/EF.Test/UserStoreIntKeyTest.cs rename to src/Identity/EF/test/EF.Test/UserStoreIntKeyTest.cs diff --git a/src/Identity/test/EF.Test/UserStoreStringKeyTest.cs b/src/Identity/EF/test/EF.Test/UserStoreStringKeyTest.cs similarity index 100% rename from src/Identity/test/EF.Test/UserStoreStringKeyTest.cs rename to src/Identity/EF/test/EF.Test/UserStoreStringKeyTest.cs diff --git a/src/Identity/test/EF.Test/UserStoreTest.cs b/src/Identity/EF/test/EF.Test/UserStoreTest.cs similarity index 100% rename from src/Identity/test/EF.Test/UserStoreTest.cs rename to src/Identity/EF/test/EF.Test/UserStoreTest.cs diff --git a/src/Identity/test/EF.Test/UserStoreWithGenericsTest.cs b/src/Identity/EF/test/EF.Test/UserStoreWithGenericsTest.cs similarity index 100% rename from src/Identity/test/EF.Test/UserStoreWithGenericsTest.cs rename to src/Identity/EF/test/EF.Test/UserStoreWithGenericsTest.cs diff --git a/src/Identity/test/EF.Test/Utilities/ScratchDatabaseFixture.cs b/src/Identity/EF/test/EF.Test/Utilities/ScratchDatabaseFixture.cs similarity index 100% rename from src/Identity/test/EF.Test/Utilities/ScratchDatabaseFixture.cs rename to src/Identity/EF/test/EF.Test/Utilities/ScratchDatabaseFixture.cs diff --git a/src/Identity/test/EF.Test/Utilities/SqlServerTestStore.cs b/src/Identity/EF/test/EF.Test/Utilities/SqlServerTestStore.cs similarity index 100% rename from src/Identity/test/EF.Test/Utilities/SqlServerTestStore.cs rename to src/Identity/EF/test/EF.Test/Utilities/SqlServerTestStore.cs diff --git a/src/Identity/test/EF.Test/Utilities/TestEnvironment.cs b/src/Identity/EF/test/EF.Test/Utilities/TestEnvironment.cs similarity index 100% rename from src/Identity/test/EF.Test/Utilities/TestEnvironment.cs rename to src/Identity/EF/test/EF.Test/Utilities/TestEnvironment.cs diff --git a/src/Identity/test/EF.Test/config.json b/src/Identity/EF/test/EF.Test/config.json similarity index 100% rename from src/Identity/test/EF.Test/config.json rename to src/Identity/EF/test/EF.Test/config.json diff --git a/src/Identity/src/Core/AuthenticatorTokenProvider.cs b/src/Identity/Extensions/Core/src/AuthenticatorTokenProvider.cs similarity index 100% rename from src/Identity/src/Core/AuthenticatorTokenProvider.cs rename to src/Identity/Extensions/Core/src/AuthenticatorTokenProvider.cs diff --git a/src/Identity/src/Core/Base32.cs b/src/Identity/Extensions/Core/src/Base32.cs similarity index 100% rename from src/Identity/src/Core/Base32.cs rename to src/Identity/Extensions/Core/src/Base32.cs diff --git a/src/Identity/src/Core/ClaimsIdentityOptions.cs b/src/Identity/Extensions/Core/src/ClaimsIdentityOptions.cs similarity index 100% rename from src/Identity/src/Core/ClaimsIdentityOptions.cs rename to src/Identity/Extensions/Core/src/ClaimsIdentityOptions.cs diff --git a/src/Identity/src/Core/DefaultPersonalDataProtector.cs b/src/Identity/Extensions/Core/src/DefaultPersonalDataProtector.cs similarity index 100% rename from src/Identity/src/Core/DefaultPersonalDataProtector.cs rename to src/Identity/Extensions/Core/src/DefaultPersonalDataProtector.cs diff --git a/src/Identity/src/Core/EmailTokenProvider.cs b/src/Identity/Extensions/Core/src/EmailTokenProvider.cs similarity index 100% rename from src/Identity/src/Core/EmailTokenProvider.cs rename to src/Identity/Extensions/Core/src/EmailTokenProvider.cs diff --git a/src/Identity/src/Core/ILookupNormalizer.cs b/src/Identity/Extensions/Core/src/ILookupNormalizer.cs similarity index 100% rename from src/Identity/src/Core/ILookupNormalizer.cs rename to src/Identity/Extensions/Core/src/ILookupNormalizer.cs diff --git a/src/Identity/src/Core/ILookupProtector.cs b/src/Identity/Extensions/Core/src/ILookupProtector.cs similarity index 100% rename from src/Identity/src/Core/ILookupProtector.cs rename to src/Identity/Extensions/Core/src/ILookupProtector.cs diff --git a/src/Identity/src/Core/ILookupProtectorKeyRing.cs b/src/Identity/Extensions/Core/src/ILookupProtectorKeyRing.cs similarity index 100% rename from src/Identity/src/Core/ILookupProtectorKeyRing.cs rename to src/Identity/Extensions/Core/src/ILookupProtectorKeyRing.cs diff --git a/src/Identity/src/Core/IPasswordHasher.cs b/src/Identity/Extensions/Core/src/IPasswordHasher.cs similarity index 100% rename from src/Identity/src/Core/IPasswordHasher.cs rename to src/Identity/Extensions/Core/src/IPasswordHasher.cs diff --git a/src/Identity/src/Core/IPasswordValidator.cs b/src/Identity/Extensions/Core/src/IPasswordValidator.cs similarity index 100% rename from src/Identity/src/Core/IPasswordValidator.cs rename to src/Identity/Extensions/Core/src/IPasswordValidator.cs diff --git a/src/Identity/src/Core/IPersonalDataProtector.cs b/src/Identity/Extensions/Core/src/IPersonalDataProtector.cs similarity index 100% rename from src/Identity/src/Core/IPersonalDataProtector.cs rename to src/Identity/Extensions/Core/src/IPersonalDataProtector.cs diff --git a/src/Identity/src/Core/IProtectedUserStore.cs b/src/Identity/Extensions/Core/src/IProtectedUserStore.cs similarity index 100% rename from src/Identity/src/Core/IProtectedUserStore.cs rename to src/Identity/Extensions/Core/src/IProtectedUserStore.cs diff --git a/src/Identity/src/Core/IQueryableRoleStore.cs b/src/Identity/Extensions/Core/src/IQueryableRoleStore.cs similarity index 100% rename from src/Identity/src/Core/IQueryableRoleStore.cs rename to src/Identity/Extensions/Core/src/IQueryableRoleStore.cs diff --git a/src/Identity/src/Core/IQueryableUserStore.cs b/src/Identity/Extensions/Core/src/IQueryableUserStore.cs similarity index 100% rename from src/Identity/src/Core/IQueryableUserStore.cs rename to src/Identity/Extensions/Core/src/IQueryableUserStore.cs diff --git a/src/Identity/src/Core/IRoleClaimStore.cs b/src/Identity/Extensions/Core/src/IRoleClaimStore.cs similarity index 100% rename from src/Identity/src/Core/IRoleClaimStore.cs rename to src/Identity/Extensions/Core/src/IRoleClaimStore.cs diff --git a/src/Identity/src/Core/IRoleStore.cs b/src/Identity/Extensions/Core/src/IRoleStore.cs similarity index 100% rename from src/Identity/src/Core/IRoleStore.cs rename to src/Identity/Extensions/Core/src/IRoleStore.cs diff --git a/src/Identity/src/Core/IRoleValidator.cs b/src/Identity/Extensions/Core/src/IRoleValidator.cs similarity index 100% rename from src/Identity/src/Core/IRoleValidator.cs rename to src/Identity/Extensions/Core/src/IRoleValidator.cs diff --git a/src/Identity/src/Core/IUserAuthenticationTokenStore.cs b/src/Identity/Extensions/Core/src/IUserAuthenticationTokenStore.cs similarity index 100% rename from src/Identity/src/Core/IUserAuthenticationTokenStore.cs rename to src/Identity/Extensions/Core/src/IUserAuthenticationTokenStore.cs diff --git a/src/Identity/src/Core/IUserAuthenticatorKeyStore.cs b/src/Identity/Extensions/Core/src/IUserAuthenticatorKeyStore.cs similarity index 100% rename from src/Identity/src/Core/IUserAuthenticatorKeyStore.cs rename to src/Identity/Extensions/Core/src/IUserAuthenticatorKeyStore.cs diff --git a/src/Identity/src/Core/IUserClaimStore.cs b/src/Identity/Extensions/Core/src/IUserClaimStore.cs similarity index 100% rename from src/Identity/src/Core/IUserClaimStore.cs rename to src/Identity/Extensions/Core/src/IUserClaimStore.cs diff --git a/src/Identity/src/Core/IUserClaimsPrincipalFactory.cs b/src/Identity/Extensions/Core/src/IUserClaimsPrincipalFactory.cs similarity index 100% rename from src/Identity/src/Core/IUserClaimsPrincipalFactory.cs rename to src/Identity/Extensions/Core/src/IUserClaimsPrincipalFactory.cs diff --git a/src/Identity/src/Core/IUserEmailStore.cs b/src/Identity/Extensions/Core/src/IUserEmailStore.cs similarity index 100% rename from src/Identity/src/Core/IUserEmailStore.cs rename to src/Identity/Extensions/Core/src/IUserEmailStore.cs diff --git a/src/Identity/src/Core/IUserLockoutStore.cs b/src/Identity/Extensions/Core/src/IUserLockoutStore.cs similarity index 100% rename from src/Identity/src/Core/IUserLockoutStore.cs rename to src/Identity/Extensions/Core/src/IUserLockoutStore.cs diff --git a/src/Identity/src/Core/IUserLoginStore.cs b/src/Identity/Extensions/Core/src/IUserLoginStore.cs similarity index 100% rename from src/Identity/src/Core/IUserLoginStore.cs rename to src/Identity/Extensions/Core/src/IUserLoginStore.cs diff --git a/src/Identity/src/Core/IUserPasswordStore.cs b/src/Identity/Extensions/Core/src/IUserPasswordStore.cs similarity index 100% rename from src/Identity/src/Core/IUserPasswordStore.cs rename to src/Identity/Extensions/Core/src/IUserPasswordStore.cs diff --git a/src/Identity/src/Core/IUserPhoneNumberStore.cs b/src/Identity/Extensions/Core/src/IUserPhoneNumberStore.cs similarity index 100% rename from src/Identity/src/Core/IUserPhoneNumberStore.cs rename to src/Identity/Extensions/Core/src/IUserPhoneNumberStore.cs diff --git a/src/Identity/src/Core/IUserRoleStore.cs b/src/Identity/Extensions/Core/src/IUserRoleStore.cs similarity index 100% rename from src/Identity/src/Core/IUserRoleStore.cs rename to src/Identity/Extensions/Core/src/IUserRoleStore.cs diff --git a/src/Identity/src/Core/IUserSecurityStampStore.cs b/src/Identity/Extensions/Core/src/IUserSecurityStampStore.cs similarity index 100% rename from src/Identity/src/Core/IUserSecurityStampStore.cs rename to src/Identity/Extensions/Core/src/IUserSecurityStampStore.cs diff --git a/src/Identity/src/Core/IUserStore.cs b/src/Identity/Extensions/Core/src/IUserStore.cs similarity index 100% rename from src/Identity/src/Core/IUserStore.cs rename to src/Identity/Extensions/Core/src/IUserStore.cs diff --git a/src/Identity/src/Core/IUserTwoFactorRecoveryCodeStore.cs b/src/Identity/Extensions/Core/src/IUserTwoFactorRecoveryCodeStore.cs similarity index 100% rename from src/Identity/src/Core/IUserTwoFactorRecoveryCodeStore.cs rename to src/Identity/Extensions/Core/src/IUserTwoFactorRecoveryCodeStore.cs diff --git a/src/Identity/src/Core/IUserTwoFactorStore.cs b/src/Identity/Extensions/Core/src/IUserTwoFactorStore.cs similarity index 100% rename from src/Identity/src/Core/IUserTwoFactorStore.cs rename to src/Identity/Extensions/Core/src/IUserTwoFactorStore.cs diff --git a/src/Identity/src/Core/IUserTwoFactorTokenProvider.cs b/src/Identity/Extensions/Core/src/IUserTwoFactorTokenProvider.cs similarity index 100% rename from src/Identity/src/Core/IUserTwoFactorTokenProvider.cs rename to src/Identity/Extensions/Core/src/IUserTwoFactorTokenProvider.cs diff --git a/src/Identity/src/Core/IUserValidator.cs b/src/Identity/Extensions/Core/src/IUserValidator.cs similarity index 100% rename from src/Identity/src/Core/IUserValidator.cs rename to src/Identity/Extensions/Core/src/IUserValidator.cs diff --git a/src/Identity/src/Core/IdentityBuilder.cs b/src/Identity/Extensions/Core/src/IdentityBuilder.cs similarity index 100% rename from src/Identity/src/Core/IdentityBuilder.cs rename to src/Identity/Extensions/Core/src/IdentityBuilder.cs diff --git a/src/Identity/src/Core/IdentityError.cs b/src/Identity/Extensions/Core/src/IdentityError.cs similarity index 100% rename from src/Identity/src/Core/IdentityError.cs rename to src/Identity/Extensions/Core/src/IdentityError.cs diff --git a/src/Identity/src/Core/IdentityErrorDescriber.cs b/src/Identity/Extensions/Core/src/IdentityErrorDescriber.cs similarity index 100% rename from src/Identity/src/Core/IdentityErrorDescriber.cs rename to src/Identity/Extensions/Core/src/IdentityErrorDescriber.cs diff --git a/src/Identity/src/Core/IdentityOptions.cs b/src/Identity/Extensions/Core/src/IdentityOptions.cs similarity index 100% rename from src/Identity/src/Core/IdentityOptions.cs rename to src/Identity/Extensions/Core/src/IdentityOptions.cs diff --git a/src/Identity/src/Core/IdentityResult.cs b/src/Identity/Extensions/Core/src/IdentityResult.cs similarity index 100% rename from src/Identity/src/Core/IdentityResult.cs rename to src/Identity/Extensions/Core/src/IdentityResult.cs diff --git a/src/Identity/src/Core/IdentityServiceCollectionExtensions.cs b/src/Identity/Extensions/Core/src/IdentityServiceCollectionExtensions.cs similarity index 100% rename from src/Identity/src/Core/IdentityServiceCollectionExtensions.cs rename to src/Identity/Extensions/Core/src/IdentityServiceCollectionExtensions.cs diff --git a/src/Identity/src/Core/LockoutOptions.cs b/src/Identity/Extensions/Core/src/LockoutOptions.cs similarity index 100% rename from src/Identity/src/Core/LockoutOptions.cs rename to src/Identity/Extensions/Core/src/LockoutOptions.cs diff --git a/src/Identity/src/Core/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions/Core/src/Microsoft.Extensions.Identity.Core.csproj similarity index 53% rename from src/Identity/src/Core/Microsoft.Extensions.Identity.Core.csproj rename to src/Identity/Extensions/Core/src/Microsoft.Extensions.Identity.Core.csproj index c446217071..c642eefa5f 100644 --- a/src/Identity/src/Core/Microsoft.Extensions.Identity.Core.csproj +++ b/src/Identity/Extensions/Core/src/Microsoft.Extensions.Identity.Core.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/src/Identity/src/Core/PasswordHasher.cs b/src/Identity/Extensions/Core/src/PasswordHasher.cs similarity index 100% rename from src/Identity/src/Core/PasswordHasher.cs rename to src/Identity/Extensions/Core/src/PasswordHasher.cs diff --git a/src/Identity/src/Core/PasswordHasherCompatibilityMode.cs b/src/Identity/Extensions/Core/src/PasswordHasherCompatibilityMode.cs similarity index 100% rename from src/Identity/src/Core/PasswordHasherCompatibilityMode.cs rename to src/Identity/Extensions/Core/src/PasswordHasherCompatibilityMode.cs diff --git a/src/Identity/src/Core/PasswordHasherOptions.cs b/src/Identity/Extensions/Core/src/PasswordHasherOptions.cs similarity index 100% rename from src/Identity/src/Core/PasswordHasherOptions.cs rename to src/Identity/Extensions/Core/src/PasswordHasherOptions.cs diff --git a/src/Identity/src/Core/PasswordOptions.cs b/src/Identity/Extensions/Core/src/PasswordOptions.cs similarity index 100% rename from src/Identity/src/Core/PasswordOptions.cs rename to src/Identity/Extensions/Core/src/PasswordOptions.cs diff --git a/src/Identity/src/Core/PasswordValidator.cs b/src/Identity/Extensions/Core/src/PasswordValidator.cs similarity index 100% rename from src/Identity/src/Core/PasswordValidator.cs rename to src/Identity/Extensions/Core/src/PasswordValidator.cs diff --git a/src/Identity/src/Core/PasswordVerificationResult.cs b/src/Identity/Extensions/Core/src/PasswordVerificationResult.cs similarity index 100% rename from src/Identity/src/Core/PasswordVerificationResult.cs rename to src/Identity/Extensions/Core/src/PasswordVerificationResult.cs diff --git a/src/Identity/src/Core/PersonalDataAttribute.cs b/src/Identity/Extensions/Core/src/PersonalDataAttribute.cs similarity index 100% rename from src/Identity/src/Core/PersonalDataAttribute.cs rename to src/Identity/Extensions/Core/src/PersonalDataAttribute.cs diff --git a/src/Identity/src/Core/PhoneNumberTokenProvider.cs b/src/Identity/Extensions/Core/src/PhoneNumberTokenProvider.cs similarity index 100% rename from src/Identity/src/Core/PhoneNumberTokenProvider.cs rename to src/Identity/Extensions/Core/src/PhoneNumberTokenProvider.cs diff --git a/src/Identity/src/Core/PrincipalExtensions.cs b/src/Identity/Extensions/Core/src/PrincipalExtensions.cs similarity index 100% rename from src/Identity/src/Core/PrincipalExtensions.cs rename to src/Identity/Extensions/Core/src/PrincipalExtensions.cs diff --git a/src/Identity/src/Core/Properties/AssemblyInfo.cs b/src/Identity/Extensions/Core/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Identity/src/Core/Properties/AssemblyInfo.cs rename to src/Identity/Extensions/Core/src/Properties/AssemblyInfo.cs diff --git a/src/Identity/src/Core/Properties/Resources.Designer.cs b/src/Identity/Extensions/Core/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Identity/src/Core/Properties/Resources.Designer.cs rename to src/Identity/Extensions/Core/src/Properties/Resources.Designer.cs diff --git a/src/Identity/src/Core/ProtectedPersonalDataAttribute.cs b/src/Identity/Extensions/Core/src/ProtectedPersonalDataAttribute.cs similarity index 100% rename from src/Identity/src/Core/ProtectedPersonalDataAttribute.cs rename to src/Identity/Extensions/Core/src/ProtectedPersonalDataAttribute.cs diff --git a/src/Identity/src/Core/Resources.resx b/src/Identity/Extensions/Core/src/Resources.resx similarity index 100% rename from src/Identity/src/Core/Resources.resx rename to src/Identity/Extensions/Core/src/Resources.resx diff --git a/src/Identity/src/Core/Rfc6238AuthenticationService.cs b/src/Identity/Extensions/Core/src/Rfc6238AuthenticationService.cs similarity index 100% rename from src/Identity/src/Core/Rfc6238AuthenticationService.cs rename to src/Identity/Extensions/Core/src/Rfc6238AuthenticationService.cs diff --git a/src/Identity/src/Core/RoleManager.cs b/src/Identity/Extensions/Core/src/RoleManager.cs similarity index 100% rename from src/Identity/src/Core/RoleManager.cs rename to src/Identity/Extensions/Core/src/RoleManager.cs diff --git a/src/Identity/src/Core/RoleValidator.cs b/src/Identity/Extensions/Core/src/RoleValidator.cs similarity index 100% rename from src/Identity/src/Core/RoleValidator.cs rename to src/Identity/Extensions/Core/src/RoleValidator.cs diff --git a/src/Identity/src/Core/SignInOptions.cs b/src/Identity/Extensions/Core/src/SignInOptions.cs similarity index 100% rename from src/Identity/src/Core/SignInOptions.cs rename to src/Identity/Extensions/Core/src/SignInOptions.cs diff --git a/src/Identity/src/Core/SignInResult.cs b/src/Identity/Extensions/Core/src/SignInResult.cs similarity index 100% rename from src/Identity/src/Core/SignInResult.cs rename to src/Identity/Extensions/Core/src/SignInResult.cs diff --git a/src/Identity/src/Core/StoreOptions.cs b/src/Identity/Extensions/Core/src/StoreOptions.cs similarity index 100% rename from src/Identity/src/Core/StoreOptions.cs rename to src/Identity/Extensions/Core/src/StoreOptions.cs diff --git a/src/Identity/src/Core/TokenOptions.cs b/src/Identity/Extensions/Core/src/TokenOptions.cs similarity index 100% rename from src/Identity/src/Core/TokenOptions.cs rename to src/Identity/Extensions/Core/src/TokenOptions.cs diff --git a/src/Identity/src/Core/TokenProviderDescriptor.cs b/src/Identity/Extensions/Core/src/TokenProviderDescriptor.cs similarity index 100% rename from src/Identity/src/Core/TokenProviderDescriptor.cs rename to src/Identity/Extensions/Core/src/TokenProviderDescriptor.cs diff --git a/src/Identity/src/Core/TotpSecurityStampBasedTokenProvider.cs b/src/Identity/Extensions/Core/src/TotpSecurityStampBasedTokenProvider.cs similarity index 100% rename from src/Identity/src/Core/TotpSecurityStampBasedTokenProvider.cs rename to src/Identity/Extensions/Core/src/TotpSecurityStampBasedTokenProvider.cs diff --git a/src/Identity/src/Core/UpperInvariantLookupNormalizer.cs b/src/Identity/Extensions/Core/src/UpperInvariantLookupNormalizer.cs similarity index 100% rename from src/Identity/src/Core/UpperInvariantLookupNormalizer.cs rename to src/Identity/Extensions/Core/src/UpperInvariantLookupNormalizer.cs diff --git a/src/Identity/src/Core/UserClaimsPrincipalFactory.cs b/src/Identity/Extensions/Core/src/UserClaimsPrincipalFactory.cs similarity index 100% rename from src/Identity/src/Core/UserClaimsPrincipalFactory.cs rename to src/Identity/Extensions/Core/src/UserClaimsPrincipalFactory.cs diff --git a/src/Identity/src/Core/UserLoginInfo.cs b/src/Identity/Extensions/Core/src/UserLoginInfo.cs similarity index 100% rename from src/Identity/src/Core/UserLoginInfo.cs rename to src/Identity/Extensions/Core/src/UserLoginInfo.cs diff --git a/src/Identity/src/Core/UserManager.cs b/src/Identity/Extensions/Core/src/UserManager.cs similarity index 100% rename from src/Identity/src/Core/UserManager.cs rename to src/Identity/Extensions/Core/src/UserManager.cs diff --git a/src/Identity/src/Core/UserOptions.cs b/src/Identity/Extensions/Core/src/UserOptions.cs similarity index 100% rename from src/Identity/src/Core/UserOptions.cs rename to src/Identity/Extensions/Core/src/UserOptions.cs diff --git a/src/Identity/src/Core/UserValidator.cs b/src/Identity/Extensions/Core/src/UserValidator.cs similarity index 100% rename from src/Identity/src/Core/UserValidator.cs rename to src/Identity/Extensions/Core/src/UserValidator.cs diff --git a/src/Identity/src/Core/baseline.netcore.json b/src/Identity/Extensions/Core/src/baseline.netcore.json similarity index 100% rename from src/Identity/src/Core/baseline.netcore.json rename to src/Identity/Extensions/Core/src/baseline.netcore.json diff --git a/src/Identity/src/Stores/IdentityRole.cs b/src/Identity/Extensions/Stores/src/IdentityRole.cs similarity index 100% rename from src/Identity/src/Stores/IdentityRole.cs rename to src/Identity/Extensions/Stores/src/IdentityRole.cs diff --git a/src/Identity/src/Stores/IdentityRoleClaim.cs b/src/Identity/Extensions/Stores/src/IdentityRoleClaim.cs similarity index 100% rename from src/Identity/src/Stores/IdentityRoleClaim.cs rename to src/Identity/Extensions/Stores/src/IdentityRoleClaim.cs diff --git a/src/Identity/src/Stores/IdentityUser.cs b/src/Identity/Extensions/Stores/src/IdentityUser.cs similarity index 100% rename from src/Identity/src/Stores/IdentityUser.cs rename to src/Identity/Extensions/Stores/src/IdentityUser.cs diff --git a/src/Identity/src/Stores/IdentityUserClaim.cs b/src/Identity/Extensions/Stores/src/IdentityUserClaim.cs similarity index 100% rename from src/Identity/src/Stores/IdentityUserClaim.cs rename to src/Identity/Extensions/Stores/src/IdentityUserClaim.cs diff --git a/src/Identity/src/Stores/IdentityUserLogin.cs b/src/Identity/Extensions/Stores/src/IdentityUserLogin.cs similarity index 100% rename from src/Identity/src/Stores/IdentityUserLogin.cs rename to src/Identity/Extensions/Stores/src/IdentityUserLogin.cs diff --git a/src/Identity/src/Stores/IdentityUserRole.cs b/src/Identity/Extensions/Stores/src/IdentityUserRole.cs similarity index 100% rename from src/Identity/src/Stores/IdentityUserRole.cs rename to src/Identity/Extensions/Stores/src/IdentityUserRole.cs diff --git a/src/Identity/src/Stores/IdentityUserToken.cs b/src/Identity/Extensions/Stores/src/IdentityUserToken.cs similarity index 100% rename from src/Identity/src/Stores/IdentityUserToken.cs rename to src/Identity/Extensions/Stores/src/IdentityUserToken.cs diff --git a/src/Identity/src/Stores/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions/Stores/src/Microsoft.Extensions.Identity.Stores.csproj similarity index 62% rename from src/Identity/src/Stores/Microsoft.Extensions.Identity.Stores.csproj rename to src/Identity/Extensions/Stores/src/Microsoft.Extensions.Identity.Stores.csproj index 10e6e98997..54cba983bc 100644 --- a/src/Identity/src/Stores/Microsoft.Extensions.Identity.Stores.csproj +++ b/src/Identity/Extensions/Stores/src/Microsoft.Extensions.Identity.Stores.csproj @@ -8,12 +8,9 @@ - - - - - - + + + diff --git a/src/Identity/src/Stores/RoleStoreBase.cs b/src/Identity/Extensions/Stores/src/RoleStoreBase.cs similarity index 100% rename from src/Identity/src/Stores/RoleStoreBase.cs rename to src/Identity/Extensions/Stores/src/RoleStoreBase.cs diff --git a/src/Identity/src/Stores/UserStoreBase.cs b/src/Identity/Extensions/Stores/src/UserStoreBase.cs similarity index 100% rename from src/Identity/src/Stores/UserStoreBase.cs rename to src/Identity/Extensions/Stores/src/UserStoreBase.cs diff --git a/src/Identity/src/Stores/baseline.netcore.json b/src/Identity/Extensions/Stores/src/baseline.netcore.json similarity index 100% rename from src/Identity/src/Stores/baseline.netcore.json rename to src/Identity/Extensions/Stores/src/baseline.netcore.json diff --git a/src/Identity/Identity.sln b/src/Identity/Identity.sln index 3beeb039f6..75fe67206a 100644 --- a/src/Identity/Identity.sln +++ b/src/Identity/Identity.sln @@ -3,478 +3,566 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0F647068-6602-4E24-B1DC-8ED91481A50A}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{52D59F18-62D2-4D17-8CF2-BE192445AF8E}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{46F9634A-91ED-48BE-BA27-A7561F85BF75}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "src\Identity\Microsoft.AspNetCore.Identity.csproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "..\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{5215C432-FB85-4CD5-9E7D-7BE750236837}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{58D94A0E-C2B7-43A7-8826-99ECBB1E0A50}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{15057F38-D71E-4016-9493-A089E30AF7B3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{44BFF01A-C29F-46D8-BF5F-4A1690D386E5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "test\EF.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{37236EA3-915D-46D5-997C-DF513C500E4B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{5710DBA7-53D9-4341-BF04-00AB1839B99B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "test\EF.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{36682549-97F8-45E4-A4C8-C868D9E698B9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{4490894C-3572-4E63-86F1-EE5105CE8A06}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "EF\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{8E3553B9-5197-4CE7-A678-A224B41A5259}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.Identity.AspNetCoreCompat", "src\AspNetCoreCompat\Microsoft.AspNet.Identity.AspNetCoreCompat.csproj", "{6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "EF\test\EF.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{9522CE22-FD8E-4193-8507-F2DB94D074EE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "src\Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{5608E828-DD54-4E2A-B73C-FC22268BE797}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "EF\test\EF.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{3DDF86A8-1385-44B1-A6D4-36E92F58538F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "src\Core\Microsoft.Extensions.Identity.Core.csproj", "{D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{29AC3D1D-1BA3-4546-AF70-EEEDDD91E419}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "src\Stores\Microsoft.Extensions.Identity.Stores.csproj", "{FADA11FC-DC06-4832-A569-7B2374A6CD42}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DCB90F05-3824-45D8-943C-34568C26CBDF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{1F83D453-E094-4D28-BCFA-9E537ABB5AD6}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4A07C63B-C891-44BE-A61C-384E066FBCA7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{42F5B772-1D61-4C18-9457-412DE8E170A5}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - EndProjectSection +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{7AF5097F-8F34-4BB0-9D07-D4546196FB15}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeWPFClient", "samples\NativeWPFClient\NativeWPFClient.csproj", "{39AA4E4D-5E62-4213-8641-BF8012D45DE4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{3BAE2AA9-B3F4-4562-B4BD-25FDC959A324}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "Identity\samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "src\UI\Microsoft.AspNetCore.Identity.UI.csproj", "{894E102D-56D4-4B02-8F13-8781F4324C3E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "Identity\samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "test\WebSites\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{CAE02AD2-F941-4ACB-B469-13EFF551BB74}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeWPFClient", "Identity\samples\NativeWPFClient\NativeWPFClient.csproj", "{39AA4E4D-5E62-4213-8641-BF8012D45DE4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.FunctionalTests", "test\Identity.FunctionalTests\Microsoft.AspNetCore.Identity.FunctionalTests.csproj", "{B3616029-7DA6-4FB3-8722-D5AC69884B3F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.FunctionalTests", "Identity\test\Identity.FunctionalTests\Microsoft.AspNetCore.Identity.FunctionalTests.csproj", "{2284A207-D296-4E05-AC7B-B975EECA32D4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "Identity\test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "Identity\test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{CAB40170-1421-479C-90C8-A371418B129F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "Identity\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Facebook", "..\Security\Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj", "{6AF1AB00-AC66-4E6A-A4EF-F234245AD305}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "..\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj", "{C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Twitter", "..\Security\Authentication\Twitter\src\Microsoft.AspNetCore.Authentication.Twitter.csproj", "{FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{EE1D2A07-6916-4005-A436-E429BD37B2CA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "Extensions\Stores\src\Microsoft.Extensions.Identity.Stores.csproj", "{11826DEB-AE94-4B3F-A488-A51E74EC54BC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "Extensions\Core\src\Microsoft.Extensions.Identity.Core.csproj", "{08A29FAA-F7EF-4C19-B778-549249CAC12F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EF", "EF", "{1BBC85BA-23B4-497F-AE6B-B79B8A9280F1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "Identity\Core\src\Microsoft.AspNetCore.Identity.csproj", "{69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj", "{3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrite", "..\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj", "{34C4C369-181A-4D75-A57F-A2FA7812C443}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{B253FFAE-6FAD-4D41-BCA0-828A05DE9021}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{71599893-1998-4F4D-A308-16DF48B97E2D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{03D80D01-8D41-4E27-BC58-215893414F24}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{F1CF8EA9-7498-4416-B711-B93A1B4656E1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - DebugNoWPF|Any CPU = DebugNoWPF|Any CPU - DebugNoWPF|x64 = DebugNoWPF|x64 - DebugNoWPF|x86 = DebugNoWPF|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 - ReleaseNoWPF|Any CPU = ReleaseNoWPF|Any CPU - ReleaseNoWPF|x64 = ReleaseNoWPF|x64 - ReleaseNoWPF|x86 = ReleaseNoWPF|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|x64.ActiveCfg = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|x64.Build.0 = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|x86.ActiveCfg = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|x86.Build.0 = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|Any CPU.Build.0 = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|x64.ActiveCfg = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|x64.Build.0 = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|x86.ActiveCfg = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|x86.Build.0 = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|x64.ActiveCfg = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|x64.Build.0 = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|x86.ActiveCfg = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|x86.Build.0 = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|Any CPU.Build.0 = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|x64.ActiveCfg = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|x64.Build.0 = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|x86.ActiveCfg = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|x86.Build.0 = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|x64.ActiveCfg = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|x64.Build.0 = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|x86.ActiveCfg = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|x86.Build.0 = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|Any CPU.Build.0 = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|x64.ActiveCfg = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|x64.Build.0 = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|x86.ActiveCfg = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|x86.Build.0 = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|x64.ActiveCfg = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|x64.Build.0 = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|x86.ActiveCfg = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|x86.Build.0 = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|Any CPU.Build.0 = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|x64.ActiveCfg = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|x64.Build.0 = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|x86.ActiveCfg = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|x86.Build.0 = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|x64.ActiveCfg = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|x64.Build.0 = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|x86.ActiveCfg = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|x86.Build.0 = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|Any CPU.Build.0 = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|x64.ActiveCfg = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|x64.Build.0 = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|x86.ActiveCfg = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|x86.Build.0 = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|x64.ActiveCfg = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|x64.Build.0 = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|x86.ActiveCfg = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|x86.Build.0 = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|Any CPU.Build.0 = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|x64.ActiveCfg = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|x64.Build.0 = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|x86.ActiveCfg = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|x86.Build.0 = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|x64.ActiveCfg = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|x64.Build.0 = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|x86.ActiveCfg = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|x86.Build.0 = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Any CPU.Build.0 = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|x64.ActiveCfg = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|x64.Build.0 = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|x86.ActiveCfg = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|x86.Build.0 = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|x64.ActiveCfg = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|x64.Build.0 = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|x86.ActiveCfg = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|x86.Build.0 = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|Any CPU.Build.0 = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|x64.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|x64.Build.0 = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|x86.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|x86.Build.0 = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|x64.ActiveCfg = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|x64.Build.0 = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|x86.ActiveCfg = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|x86.Build.0 = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|Any CPU.Build.0 = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|x64.ActiveCfg = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|x64.Build.0 = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|x86.ActiveCfg = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|x86.Build.0 = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|x64.ActiveCfg = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|x64.Build.0 = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|x86.ActiveCfg = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|x86.Build.0 = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|Any CPU.Build.0 = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|x64.ActiveCfg = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|x64.Build.0 = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|x86.ActiveCfg = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|x86.Build.0 = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|x64.ActiveCfg = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|x64.Build.0 = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|x86.ActiveCfg = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|x86.Build.0 = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|Any CPU.Build.0 = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|x64.ActiveCfg = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|x64.Build.0 = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|x86.ActiveCfg = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|x86.Build.0 = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|Any CPU.Build.0 = Debug|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|x64.ActiveCfg = Debug|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|x64.Build.0 = Debug|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|x86.ActiveCfg = Debug|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|x86.Build.0 = Debug|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|Any CPU.ActiveCfg = Release|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|Any CPU.Build.0 = Release|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|x64.ActiveCfg = Release|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|x64.Build.0 = Release|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|x86.ActiveCfg = Release|Any CPU + {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|x86.Build.0 = Release|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|x64.ActiveCfg = Debug|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|x64.Build.0 = Debug|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|x86.ActiveCfg = Debug|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|x86.Build.0 = Debug|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|Any CPU.Build.0 = Release|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|x64.ActiveCfg = Release|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|x64.Build.0 = Release|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|x86.ActiveCfg = Release|Any CPU + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|x86.Build.0 = Release|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|x64.ActiveCfg = Debug|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|x64.Build.0 = Debug|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|x86.ActiveCfg = Debug|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|x86.Build.0 = Debug|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|Any CPU.Build.0 = Release|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|x64.ActiveCfg = Release|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|x64.Build.0 = Release|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|x86.ActiveCfg = Release|Any CPU + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|x86.Build.0 = Release|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|x64.ActiveCfg = Debug|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|x64.Build.0 = Debug|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|x86.ActiveCfg = Debug|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|x86.Build.0 = Debug|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|Any CPU.Build.0 = Release|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|x64.ActiveCfg = Release|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|x64.Build.0 = Release|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|x86.ActiveCfg = Release|Any CPU + {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|x86.Build.0 = Release|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|x64.ActiveCfg = Debug|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|x64.Build.0 = Debug|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|x86.ActiveCfg = Debug|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|x86.Build.0 = Debug|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|Any CPU.Build.0 = Release|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|x64.ActiveCfg = Release|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|x64.Build.0 = Release|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|x86.ActiveCfg = Release|Any CPU + {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|x86.Build.0 = Release|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|x64.ActiveCfg = Debug|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|x64.Build.0 = Debug|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|x86.ActiveCfg = Debug|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|x86.Build.0 = Debug|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|Any CPU.Build.0 = Release|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|x64.ActiveCfg = Release|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|x64.Build.0 = Release|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|x86.ActiveCfg = Release|Any CPU + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|x86.Build.0 = Release|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|x64.ActiveCfg = Debug|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|x64.Build.0 = Debug|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|x86.ActiveCfg = Debug|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|x86.Build.0 = Debug|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|Any CPU.Build.0 = Release|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|x64.ActiveCfg = Release|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|x64.Build.0 = Release|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|x86.ActiveCfg = Release|Any CPU + {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|x86.Build.0 = Release|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|x64.ActiveCfg = Debug|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|x64.Build.0 = Debug|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|x86.ActiveCfg = Debug|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|x86.Build.0 = Debug|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|Any CPU.Build.0 = Release|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|x64.ActiveCfg = Release|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|x64.Build.0 = Release|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|x86.ActiveCfg = Release|Any CPU + {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|x86.Build.0 = Release|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|x64.ActiveCfg = Debug|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|x64.Build.0 = Debug|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|x86.ActiveCfg = Debug|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|x86.Build.0 = Debug|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|Any CPU.Build.0 = Release|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|x64.ActiveCfg = Release|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|x64.Build.0 = Release|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|x86.ActiveCfg = Release|Any CPU + {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|x86.Build.0 = Release|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|x64.ActiveCfg = Debug|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|x64.Build.0 = Debug|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|x86.ActiveCfg = Debug|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|x86.Build.0 = Debug|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|Any CPU.Build.0 = Release|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|x64.ActiveCfg = Release|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|x64.Build.0 = Release|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|x86.ActiveCfg = Release|Any CPU + {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|x86.Build.0 = Release|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|x64.ActiveCfg = Debug|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|x64.Build.0 = Debug|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|x86.ActiveCfg = Debug|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|x86.Build.0 = Debug|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|Any CPU.Build.0 = Release|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|x64.ActiveCfg = Release|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|x64.Build.0 = Release|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|x86.ActiveCfg = Release|Any CPU + {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|x86.Build.0 = Release|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|x64.ActiveCfg = Debug|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|x64.Build.0 = Debug|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|x86.ActiveCfg = Debug|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|x86.Build.0 = Debug|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|Any CPU.Build.0 = Release|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|x64.ActiveCfg = Release|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|x64.Build.0 = Release|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|x86.ActiveCfg = Release|Any CPU + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|x86.Build.0 = Release|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|x64.ActiveCfg = Debug|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|x64.Build.0 = Debug|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|x86.ActiveCfg = Debug|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|x86.Build.0 = Debug|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|Any CPU.Build.0 = Release|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|x64.ActiveCfg = Release|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|x64.Build.0 = Release|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|x86.ActiveCfg = Release|Any CPU + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|x86.Build.0 = Release|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|x64.ActiveCfg = Debug|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|x64.Build.0 = Debug|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|x86.ActiveCfg = Debug|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|x86.Build.0 = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.DebugNoWPF|x86.Build.0 = Debug|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|Any CPU.Build.0 = Release|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|x64.ActiveCfg = Release|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|x64.Build.0 = Release|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|x86.ActiveCfg = Release|Any CPU {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|x86.Build.0 = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Debug|x64.ActiveCfg = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Debug|x64.Build.0 = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Debug|x86.ActiveCfg = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Debug|x86.Build.0 = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Release|Any CPU.Build.0 = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Release|x64.ActiveCfg = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Release|x64.Build.0 = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Release|x86.ActiveCfg = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.Release|x86.Build.0 = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Debug|x64.ActiveCfg = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Debug|x64.Build.0 = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Debug|x86.ActiveCfg = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Debug|x86.Build.0 = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Release|Any CPU.Build.0 = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Release|x64.ActiveCfg = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Release|x64.Build.0 = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Release|x86.ActiveCfg = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.Release|x86.Build.0 = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.ReleaseNoWPF|x64.ActiveCfg = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.ReleaseNoWPF|x64.Build.0 = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.ReleaseNoWPF|x86.ActiveCfg = Release|Any CPU - {894E102D-56D4-4B02-8F13-8781F4324C3E}.ReleaseNoWPF|x86.Build.0 = Release|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Debug|x64.ActiveCfg = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Debug|x64.Build.0 = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Debug|x86.ActiveCfg = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Debug|x86.Build.0 = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Release|Any CPU.Build.0 = Release|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Release|x64.ActiveCfg = Release|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Release|x64.Build.0 = Release|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Release|x86.ActiveCfg = Release|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.Release|x86.Build.0 = Release|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.ReleaseNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.ReleaseNoWPF|Any CPU.Build.0 = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.ReleaseNoWPF|x64.ActiveCfg = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.ReleaseNoWPF|x64.Build.0 = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.ReleaseNoWPF|x86.ActiveCfg = Debug|Any CPU - {CAE02AD2-F941-4ACB-B469-13EFF551BB74}.ReleaseNoWPF|x86.Build.0 = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Debug|x64.ActiveCfg = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Debug|x64.Build.0 = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Debug|x86.ActiveCfg = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Debug|x86.Build.0 = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.DebugNoWPF|Any CPU.ActiveCfg = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.DebugNoWPF|Any CPU.Build.0 = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.DebugNoWPF|x64.ActiveCfg = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.DebugNoWPF|x64.Build.0 = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.DebugNoWPF|x86.ActiveCfg = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.DebugNoWPF|x86.Build.0 = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Release|Any CPU.Build.0 = Release|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Release|x64.ActiveCfg = Release|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Release|x64.Build.0 = Release|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Release|x86.ActiveCfg = Release|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.Release|x86.Build.0 = Release|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.ReleaseNoWPF|Any CPU.ActiveCfg = Release|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.ReleaseNoWPF|Any CPU.Build.0 = Release|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.ReleaseNoWPF|x64.ActiveCfg = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.ReleaseNoWPF|x64.Build.0 = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.ReleaseNoWPF|x86.ActiveCfg = Debug|Any CPU - {B3616029-7DA6-4FB3-8722-D5AC69884B3F}.ReleaseNoWPF|x86.Build.0 = Debug|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|x64.ActiveCfg = Debug|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|x64.Build.0 = Debug|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|x86.ActiveCfg = Debug|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|x86.Build.0 = Debug|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|Any CPU.Build.0 = Release|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|x64.ActiveCfg = Release|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|x64.Build.0 = Release|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|x86.ActiveCfg = Release|Any CPU + {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|x86.Build.0 = Release|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|x64.ActiveCfg = Debug|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|x64.Build.0 = Debug|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|x86.ActiveCfg = Debug|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|x86.Build.0 = Debug|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|Any CPU.Build.0 = Release|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|x64.ActiveCfg = Release|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|x64.Build.0 = Release|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|x86.ActiveCfg = Release|Any CPU + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|x86.Build.0 = Release|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Debug|x64.ActiveCfg = Debug|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Debug|x64.Build.0 = Debug|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Debug|x86.ActiveCfg = Debug|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Debug|x86.Build.0 = Debug|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Release|Any CPU.Build.0 = Release|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Release|x64.ActiveCfg = Release|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Release|x64.Build.0 = Release|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Release|x86.ActiveCfg = Release|Any CPU + {CAB40170-1421-479C-90C8-A371418B129F}.Release|x86.Build.0 = Release|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|x64.ActiveCfg = Debug|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|x64.Build.0 = Debug|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|x86.ActiveCfg = Debug|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|x86.Build.0 = Debug|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|Any CPU.Build.0 = Release|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|x64.ActiveCfg = Release|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|x64.Build.0 = Release|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|x86.ActiveCfg = Release|Any CPU + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|x86.Build.0 = Release|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|x64.ActiveCfg = Debug|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|x64.Build.0 = Debug|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|x86.ActiveCfg = Debug|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|x86.Build.0 = Debug|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|Any CPU.Build.0 = Release|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|x64.ActiveCfg = Release|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|x64.Build.0 = Release|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|x86.ActiveCfg = Release|Any CPU + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|x86.Build.0 = Release|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|x64.ActiveCfg = Debug|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|x64.Build.0 = Debug|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|x86.ActiveCfg = Debug|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|x86.Build.0 = Debug|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|Any CPU.Build.0 = Release|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|x64.ActiveCfg = Release|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|x64.Build.0 = Release|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|x86.ActiveCfg = Release|Any CPU + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|x86.Build.0 = Release|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|x64.ActiveCfg = Debug|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|x64.Build.0 = Debug|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|x86.ActiveCfg = Debug|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|x86.Build.0 = Debug|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|Any CPU.Build.0 = Release|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|x64.ActiveCfg = Release|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|x64.Build.0 = Release|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|x86.ActiveCfg = Release|Any CPU + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|x86.Build.0 = Release|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|x64.ActiveCfg = Debug|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|x64.Build.0 = Debug|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|x86.ActiveCfg = Debug|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|x86.Build.0 = Debug|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|Any CPU.Build.0 = Release|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|x64.ActiveCfg = Release|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|x64.Build.0 = Release|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|x86.ActiveCfg = Release|Any CPU + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|x86.Build.0 = Release|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|x64.ActiveCfg = Debug|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|x64.Build.0 = Debug|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|x86.ActiveCfg = Debug|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|x86.Build.0 = Debug|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|Any CPU.Build.0 = Release|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|x64.ActiveCfg = Release|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|x64.Build.0 = Release|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|x86.ActiveCfg = Release|Any CPU + {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|x86.Build.0 = Release|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|x64.ActiveCfg = Debug|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|x64.Build.0 = Debug|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|x86.ActiveCfg = Debug|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|x86.Build.0 = Debug|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|Any CPU.Build.0 = Release|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|x64.ActiveCfg = Release|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|x64.Build.0 = Release|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|x86.ActiveCfg = Release|Any CPU + {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|x86.Build.0 = Release|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|x64.ActiveCfg = Debug|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|x64.Build.0 = Debug|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|x86.ActiveCfg = Debug|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|x86.Build.0 = Debug|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|Any CPU.Build.0 = Release|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|x64.ActiveCfg = Release|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|x64.Build.0 = Release|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|x86.ActiveCfg = Release|Any CPU + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|x86.Build.0 = Release|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|x64.ActiveCfg = Debug|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|x64.Build.0 = Debug|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|x86.ActiveCfg = Debug|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|x86.Build.0 = Debug|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|Any CPU.Build.0 = Release|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|x64.ActiveCfg = Release|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|x64.Build.0 = Release|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|x86.ActiveCfg = Release|Any CPU + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|x86.Build.0 = Release|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|x64.ActiveCfg = Debug|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|x64.Build.0 = Debug|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|x86.ActiveCfg = Debug|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|x86.Build.0 = Debug|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|Any CPU.Build.0 = Release|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|x64.ActiveCfg = Release|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|x64.Build.0 = Release|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|x86.ActiveCfg = Release|Any CPU + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|x86.Build.0 = Release|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|x64.ActiveCfg = Debug|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|x64.Build.0 = Debug|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|x86.ActiveCfg = Debug|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|x86.Build.0 = Debug|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|Any CPU.Build.0 = Release|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|x64.ActiveCfg = Release|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|x64.Build.0 = Release|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|x86.ActiveCfg = Release|Any CPU + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|x86.Build.0 = Release|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|x64.ActiveCfg = Debug|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|x64.Build.0 = Debug|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|x86.ActiveCfg = Debug|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|x86.Build.0 = Debug|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|Any CPU.Build.0 = Release|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|x64.ActiveCfg = Release|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|x64.Build.0 = Release|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|x86.ActiveCfg = Release|Any CPU + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|x86.Build.0 = Release|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|x64.ActiveCfg = Debug|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|x64.Build.0 = Debug|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|x86.ActiveCfg = Debug|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|x86.Build.0 = Debug|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|Any CPU.Build.0 = Release|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|x64.ActiveCfg = Release|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|x64.Build.0 = Release|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|x86.ActiveCfg = Release|Any CPU + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|x86.Build.0 = Release|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|x64.ActiveCfg = Debug|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|x64.Build.0 = Debug|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|x86.ActiveCfg = Debug|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|x86.Build.0 = Debug|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|Any CPU.ActiveCfg = Release|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|Any CPU.Build.0 = Release|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|x64.ActiveCfg = Release|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|x64.Build.0 = Release|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|x86.ActiveCfg = Release|Any CPU + {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|x86.Build.0 = Release|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|x64.ActiveCfg = Debug|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|x64.Build.0 = Debug|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|x86.ActiveCfg = Debug|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|x86.Build.0 = Debug|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|Any CPU.Build.0 = Release|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|x64.ActiveCfg = Release|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|x64.Build.0 = Release|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|x86.ActiveCfg = Release|Any CPU + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|x86.Build.0 = Release|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|x64.ActiveCfg = Debug|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|x64.Build.0 = Debug|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|x86.ActiveCfg = Debug|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|x86.Build.0 = Debug|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|Any CPU.Build.0 = Release|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|x64.ActiveCfg = Release|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|x64.Build.0 = Release|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|x86.ActiveCfg = Release|Any CPU + {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|x86.Build.0 = Release|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|x64.ActiveCfg = Debug|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|x64.Build.0 = Debug|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|x86.ActiveCfg = Debug|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|x86.Build.0 = Debug|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Release|Any CPU.Build.0 = Release|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Release|x64.ActiveCfg = Release|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Release|x64.Build.0 = Release|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Release|x86.ActiveCfg = Release|Any CPU + {03D80D01-8D41-4E27-BC58-215893414F24}.Release|x86.Build.0 = Release|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|x64.ActiveCfg = Debug|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|x64.Build.0 = Debug|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|x86.ActiveCfg = Debug|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|x86.Build.0 = Debug|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|Any CPU.Build.0 = Release|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|x64.ActiveCfg = Release|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|x64.Build.0 = Release|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|x86.ActiveCfg = Release|Any CPU + {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1729302E-A58E-4652-B639-5B6B68DA2748} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {2CF3927B-19E4-4866-9BAA-2C131580E7C3} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {65161409-C4C4-4D63-A73B-231FCFF4D503} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6} = {58D94A0E-C2B7-43A7-8826-99ECBB1E0A50} - {37236EA3-915D-46D5-997C-DF513C500E4B} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {4490894C-3572-4E63-86F1-EE5105CE8A06} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {5608E828-DD54-4E2A-B73C-FC22268BE797} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {FADA11FC-DC06-4832-A569-7B2374A6CD42} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {1F83D453-E094-4D28-BCFA-9E537ABB5AD6} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {39AA4E4D-5E62-4213-8641-BF8012D45DE4} = {58D94A0E-C2B7-43A7-8826-99ECBB1E0A50} - {ACC75F4F-EA7D-49E0-A64C-9D4A3DFD5B8A} = {58D94A0E-C2B7-43A7-8826-99ECBB1E0A50} - {894E102D-56D4-4B02-8F13-8781F4324C3E} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {CAE02AD2-F941-4ACB-B469-13EFF551BB74} = {1F83D453-E094-4D28-BCFA-9E537ABB5AD6} - {B3616029-7DA6-4FB3-8722-D5AC69884B3F} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} + {46F9634A-91ED-48BE-BA27-A7561F85BF75} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {5215C432-FB85-4CD5-9E7D-7BE750236837} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {15057F38-D71E-4016-9493-A089E30AF7B3} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {44BFF01A-C29F-46D8-BF5F-4A1690D386E5} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {5710DBA7-53D9-4341-BF04-00AB1839B99B} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {36682549-97F8-45E4-A4C8-C868D9E698B9} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {8E3553B9-5197-4CE7-A678-A224B41A5259} = {1BBC85BA-23B4-497F-AE6B-B79B8A9280F1} + {9522CE22-FD8E-4193-8507-F2DB94D074EE} = {1BBC85BA-23B4-497F-AE6B-B79B8A9280F1} + {3DDF86A8-1385-44B1-A6D4-36E92F58538F} = {1BBC85BA-23B4-497F-AE6B-B79B8A9280F1} + {DCB90F05-3824-45D8-943C-34568C26CBDF} = {1BBC85BA-23B4-497F-AE6B-B79B8A9280F1} + {4A07C63B-C891-44BE-A61C-384E066FBCA7} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} + {7AF5097F-8F34-4BB0-9D07-D4546196FB15} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} + {3BAE2AA9-B3F4-4562-B4BD-25FDC959A324} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} + {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE} = {7AF5097F-8F34-4BB0-9D07-D4546196FB15} + {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E} = {7AF5097F-8F34-4BB0-9D07-D4546196FB15} + {39AA4E4D-5E62-4213-8641-BF8012D45DE4} = {7AF5097F-8F34-4BB0-9D07-D4546196FB15} + {2284A207-D296-4E05-AC7B-B975EECA32D4} = {4A07C63B-C891-44BE-A61C-384E066FBCA7} + {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5} = {4A07C63B-C891-44BE-A61C-384E066FBCA7} + {CAB40170-1421-479C-90C8-A371418B129F} = {4A07C63B-C891-44BE-A61C-384E066FBCA7} + {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2} = {3BAE2AA9-B3F4-4562-B4BD-25FDC959A324} + {6AF1AB00-AC66-4E6A-A4EF-F234245AD305} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {11826DEB-AE94-4B3F-A488-A51E74EC54BC} = {EE1D2A07-6916-4005-A436-E429BD37B2CA} + {08A29FAA-F7EF-4C19-B778-549249CAC12F} = {EE1D2A07-6916-4005-A436-E429BD37B2CA} + {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} + {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} + {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} + {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {34C4C369-181A-4D75-A57F-A2FA7812C443} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {B253FFAE-6FAD-4D41-BCA0-828A05DE9021} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {71599893-1998-4F4D-A308-16DF48B97E2D} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {03D80D01-8D41-4E27-BC58-215893414F24} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {F1CF8EA9-7498-4416-B711-B93A1B4656E1} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B3F2A592-CCE0-40C2-8CA4-7B1293DED874} diff --git a/src/Identity/src/Identity/AspNetRoleManager.cs b/src/Identity/Identity/Core/src/AspNetRoleManager.cs similarity index 100% rename from src/Identity/src/Identity/AspNetRoleManager.cs rename to src/Identity/Identity/Core/src/AspNetRoleManager.cs diff --git a/src/Identity/src/Identity/AspNetUserManager.cs b/src/Identity/Identity/Core/src/AspNetUserManager.cs similarity index 100% rename from src/Identity/src/Identity/AspNetUserManager.cs rename to src/Identity/Identity/Core/src/AspNetUserManager.cs diff --git a/src/Identity/src/Identity/BuilderExtensions.cs b/src/Identity/Identity/Core/src/BuilderExtensions.cs similarity index 100% rename from src/Identity/src/Identity/BuilderExtensions.cs rename to src/Identity/Identity/Core/src/BuilderExtensions.cs diff --git a/src/Identity/src/Identity/DataProtectionTokenProvider.cs b/src/Identity/Identity/Core/src/DataProtectionTokenProvider.cs similarity index 100% rename from src/Identity/src/Identity/DataProtectionTokenProvider.cs rename to src/Identity/Identity/Core/src/DataProtectionTokenProvider.cs diff --git a/src/Identity/src/Identity/DataProtectionTokenProviderOptions.cs b/src/Identity/Identity/Core/src/DataProtectionTokenProviderOptions.cs similarity index 100% rename from src/Identity/src/Identity/DataProtectionTokenProviderOptions.cs rename to src/Identity/Identity/Core/src/DataProtectionTokenProviderOptions.cs diff --git a/src/Identity/src/Identity/ExternalLoginInfo.cs b/src/Identity/Identity/Core/src/ExternalLoginInfo.cs similarity index 100% rename from src/Identity/src/Identity/ExternalLoginInfo.cs rename to src/Identity/Identity/Core/src/ExternalLoginInfo.cs diff --git a/src/Identity/src/Identity/ISecurityStampValidator.cs b/src/Identity/Identity/Core/src/ISecurityStampValidator.cs similarity index 100% rename from src/Identity/src/Identity/ISecurityStampValidator.cs rename to src/Identity/Identity/Core/src/ISecurityStampValidator.cs diff --git a/src/Identity/src/Identity/ITwoFactorSecurityStampValidator.cs b/src/Identity/Identity/Core/src/ITwoFactorSecurityStampValidator.cs similarity index 100% rename from src/Identity/src/Identity/ITwoFactorSecurityStampValidator.cs rename to src/Identity/Identity/Core/src/ITwoFactorSecurityStampValidator.cs diff --git a/src/Identity/src/Identity/IdentityBuilderExtensions.cs b/src/Identity/Identity/Core/src/IdentityBuilderExtensions.cs similarity index 100% rename from src/Identity/src/Identity/IdentityBuilderExtensions.cs rename to src/Identity/Identity/Core/src/IdentityBuilderExtensions.cs diff --git a/src/Identity/src/Identity/IdentityConstants.cs b/src/Identity/Identity/Core/src/IdentityConstants.cs similarity index 100% rename from src/Identity/src/Identity/IdentityConstants.cs rename to src/Identity/Identity/Core/src/IdentityConstants.cs diff --git a/src/Identity/src/Identity/IdentityCookiesBuilder.cs b/src/Identity/Identity/Core/src/IdentityCookiesBuilder.cs similarity index 100% rename from src/Identity/src/Identity/IdentityCookiesBuilder.cs rename to src/Identity/Identity/Core/src/IdentityCookiesBuilder.cs diff --git a/src/Identity/src/Identity/IdentityCookiesBuilderExtensions.cs b/src/Identity/Identity/Core/src/IdentityCookiesBuilderExtensions.cs similarity index 100% rename from src/Identity/src/Identity/IdentityCookiesBuilderExtensions.cs rename to src/Identity/Identity/Core/src/IdentityCookiesBuilderExtensions.cs diff --git a/src/Identity/src/Identity/IdentityServiceCollectionExtensions.cs b/src/Identity/Identity/Core/src/IdentityServiceCollectionExtensions.cs similarity index 100% rename from src/Identity/src/Identity/IdentityServiceCollectionExtensions.cs rename to src/Identity/Identity/Core/src/IdentityServiceCollectionExtensions.cs diff --git a/src/Identity/src/Identity/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj similarity index 51% rename from src/Identity/src/Identity/Microsoft.AspNetCore.Identity.csproj rename to src/Identity/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj index fc0fae70c8..e0c52c7412 100644 --- a/src/Identity/src/Identity/Microsoft.AspNetCore.Identity.csproj +++ b/src/Identity/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj @@ -8,13 +8,10 @@ - - - - - - - + + + + diff --git a/src/Identity/src/Identity/Properties/AssemblyInfo.cs b/src/Identity/Identity/Core/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Identity/src/Identity/Properties/AssemblyInfo.cs rename to src/Identity/Identity/Core/src/Properties/AssemblyInfo.cs diff --git a/src/Identity/src/Identity/Properties/Resources.Designer.cs b/src/Identity/Identity/Core/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Identity/src/Identity/Properties/Resources.Designer.cs rename to src/Identity/Identity/Core/src/Properties/Resources.Designer.cs diff --git a/src/Identity/src/Identity/Properties/debugSettings.json b/src/Identity/Identity/Core/src/Properties/debugSettings.json similarity index 100% rename from src/Identity/src/Identity/Properties/debugSettings.json rename to src/Identity/Identity/Core/src/Properties/debugSettings.json diff --git a/src/Identity/src/Identity/Resources.resx b/src/Identity/Identity/Core/src/Resources.resx similarity index 100% rename from src/Identity/src/Identity/Resources.resx rename to src/Identity/Identity/Core/src/Resources.resx diff --git a/src/Identity/src/Identity/SecurityStampRefreshingPrincipalContext.cs b/src/Identity/Identity/Core/src/SecurityStampRefreshingPrincipalContext.cs similarity index 100% rename from src/Identity/src/Identity/SecurityStampRefreshingPrincipalContext.cs rename to src/Identity/Identity/Core/src/SecurityStampRefreshingPrincipalContext.cs diff --git a/src/Identity/src/Identity/SecurityStampValidator.cs b/src/Identity/Identity/Core/src/SecurityStampValidator.cs similarity index 100% rename from src/Identity/src/Identity/SecurityStampValidator.cs rename to src/Identity/Identity/Core/src/SecurityStampValidator.cs diff --git a/src/Identity/src/Identity/SecurityStampValidatorOptions.cs b/src/Identity/Identity/Core/src/SecurityStampValidatorOptions.cs similarity index 100% rename from src/Identity/src/Identity/SecurityStampValidatorOptions.cs rename to src/Identity/Identity/Core/src/SecurityStampValidatorOptions.cs diff --git a/src/Identity/src/Identity/SignInManager.cs b/src/Identity/Identity/Core/src/SignInManager.cs similarity index 100% rename from src/Identity/src/Identity/SignInManager.cs rename to src/Identity/Identity/Core/src/SignInManager.cs diff --git a/src/Identity/src/Identity/TwoFactorSecurityStampValidator.cs b/src/Identity/Identity/Core/src/TwoFactorSecurityStampValidator.cs similarity index 100% rename from src/Identity/src/Identity/TwoFactorSecurityStampValidator.cs rename to src/Identity/Identity/Core/src/TwoFactorSecurityStampValidator.cs diff --git a/src/Identity/src/Identity/baseline.netcore.json b/src/Identity/Identity/Core/src/baseline.netcore.json similarity index 100% rename from src/Identity/src/Identity/baseline.netcore.json rename to src/Identity/Identity/Core/src/baseline.netcore.json diff --git a/src/Identity/src/Identity/baseline.netframework.json b/src/Identity/Identity/Core/src/baseline.netframework.json similarity index 100% rename from src/Identity/src/Identity/baseline.netframework.json rename to src/Identity/Identity/Core/src/baseline.netframework.json diff --git a/src/Identity/README.md b/src/Identity/Identity/README.md similarity index 83% rename from src/Identity/README.md rename to src/Identity/Identity/README.md index 4e4f345af9..fd725d5337 100644 --- a/src/Identity/README.md +++ b/src/Identity/Identity/README.md @@ -1,10 +1,6 @@ ASP.NET Core Identity === -AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/vf79kttspnblh2hx/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Identity/branch/dev) - -Travis: [![Travis](https://travis-ci.org/aspnet/Identity.svg?branch=dev)](https://travis-ci.org/aspnet/Identity) - ASP.NET Core Identity is the membership system for building ASP.NET Core web applications, including membership, login, and user data. ASP.NET Core Identity allows you to add login features to your application and makes it easy to customize data about the logged in user. 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. @@ -19,12 +15,12 @@ The previous versions of Identity for MVC5 and lower, previously available on Co * ASP.NET Identity MongoDB Providers: * [By Tugberk Ugurlu](https://github.com/tugberkugurlu/AspNetCore.Identity.MongoDB) - * [By Alexandre Spieser](https://github.com/alexandre-spieser/AspNetCore.Identity.MongoDbCore) - * [ASP.NET Identity LinqToDB Provider](https://github.com/ili/LinqToDB.Identity) + * [By Alexandre Spieser](https://github.com/alexandre-spieser/AspNetCore.Identity.MongoDbCore) + * [ASP.NET Identity LinqToDB Provider](https://github.com/ili/LinqToDB.Identity) * [ASP.NET Identity DynamoDB Provider](https://github.com/miltador/AspNetCore.Identity.DynamoDB) * ASP.NET Identity RavenDB Providers: * [By Judah Gabriel Himango](https://github.com/JudahGabriel/RavenDB.Identity) * [By Iskandar Rafiev](https://github.com/maqduni/AspNetCore.Identity.RavenDB) * [ASP.NET Identity Cassandra Provider](https://github.com/lkubis/AspNetCore.Identity.Cassandra) * [ASP.NET Identity Firebase Provider](https://github.com/aguacongas/Identity.Firebase) - * [ASP.NET Identity Redis Provider](https://github.com/aguacongas/Identity.Redis) + * [ASP.NET Identity Redis Provider](https://github.com/aguacongas/Identity.Redis) \ No newline at end of file diff --git a/src/Identity/src/Specification.Tests/IdentityResultAssert.cs b/src/Identity/Identity/Specification.Tests/src/IdentityResultAssert.cs similarity index 100% rename from src/Identity/src/Specification.Tests/IdentityResultAssert.cs rename to src/Identity/Identity/Specification.Tests/src/IdentityResultAssert.cs diff --git a/src/Identity/src/Specification.Tests/IdentitySpecificationTestBase.cs b/src/Identity/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs similarity index 100% rename from src/Identity/src/Specification.Tests/IdentitySpecificationTestBase.cs rename to src/Identity/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs diff --git a/src/Identity/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Identity/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj new file mode 100644 index 0000000000..0546fd40ca --- /dev/null +++ b/src/Identity/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj @@ -0,0 +1,20 @@ + + + + Shared test suite for Asp.Net Identity Core store implementations. + netstandard2.0 + true + aspnetcore;identity;membership + true + false + + + + + + + + + + + diff --git a/src/Identity/src/Specification.Tests/TestLogger.cs b/src/Identity/Identity/Specification.Tests/src/TestLogger.cs similarity index 100% rename from src/Identity/src/Specification.Tests/TestLogger.cs rename to src/Identity/Identity/Specification.Tests/src/TestLogger.cs diff --git a/src/Identity/src/Specification.Tests/UserManagerSpecificationTests.cs b/src/Identity/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs similarity index 100% rename from src/Identity/src/Specification.Tests/UserManagerSpecificationTests.cs rename to src/Identity/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs diff --git a/src/Identity/src/Specification.Tests/baseline.netcore.json b/src/Identity/Identity/Specification.Tests/src/baseline.netcore.json similarity index 100% rename from src/Identity/src/Specification.Tests/baseline.netcore.json rename to src/Identity/Identity/Specification.Tests/src/baseline.netcore.json diff --git a/src/Identity/src/UI/Areas/Identity/Filters/ExternalLoginsPageFilter.cs b/src/Identity/Identity/UI/src/Areas/Identity/Filters/ExternalLoginsPageFilter.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Filters/ExternalLoginsPageFilter.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Filters/ExternalLoginsPageFilter.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/AccessDenied.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/AccessDenied.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Lockout.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Lockout.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Lockout.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Lockout.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Login.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Login.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Login.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Login.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Logout.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Logout.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Logout.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Logout.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_Layout.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/_Layout.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_Layout.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Register.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Register.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/Register.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ResetPassword.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ResetPassword.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Account/_ViewImports.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/_ViewImports.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Account/_ViewImports.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/_ViewImports.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Error.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Error.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Error.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Error.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/Error.cshtml.cs b/src/Identity/Identity/UI/src/Areas/Identity/Pages/Error.cshtml.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/Error.cshtml.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/Error.cshtml.cs diff --git a/src/Identity/src/UI/Areas/Identity/Pages/_Layout.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/_Layout.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/_Layout.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/_Layout.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/_ViewImports.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/_ViewImports.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/_ViewImports.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/_ViewImports.cshtml diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewStart.cshtml b/src/Identity/Identity/UI/src/Areas/Identity/Pages/_ViewStart.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewStart.cshtml rename to src/Identity/Identity/UI/src/Areas/Identity/Pages/_ViewStart.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Services/EmailSender.cs b/src/Identity/Identity/UI/src/Areas/Identity/Services/EmailSender.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Services/EmailSender.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Services/EmailSender.cs diff --git a/src/Identity/src/UI/Areas/Identity/Services/IEmailSender.cs b/src/Identity/Identity/UI/src/Areas/Identity/Services/IEmailSender.cs similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Services/IEmailSender.cs rename to src/Identity/Identity/UI/src/Areas/Identity/Services/IEmailSender.cs diff --git a/src/Identity/src/UI/IdentityBuilderUIExtensions.cs b/src/Identity/Identity/UI/src/IdentityBuilderUIExtensions.cs similarity index 100% rename from src/Identity/src/UI/IdentityBuilderUIExtensions.cs rename to src/Identity/Identity/UI/src/IdentityBuilderUIExtensions.cs diff --git a/src/Identity/src/UI/IdentityDefaultUIAttribute.cs b/src/Identity/Identity/UI/src/IdentityDefaultUIAttribute.cs similarity index 100% rename from src/Identity/src/UI/IdentityDefaultUIAttribute.cs rename to src/Identity/Identity/UI/src/IdentityDefaultUIAttribute.cs diff --git a/src/Identity/src/UI/IdentityDefaultUIConfigureOptions.cs b/src/Identity/Identity/UI/src/IdentityDefaultUIConfigureOptions.cs similarity index 100% rename from src/Identity/src/UI/IdentityDefaultUIConfigureOptions.cs rename to src/Identity/Identity/UI/src/IdentityDefaultUIConfigureOptions.cs diff --git a/src/Identity/src/UI/IdentityPageModelConvention.cs b/src/Identity/Identity/UI/src/IdentityPageModelConvention.cs similarity index 100% rename from src/Identity/src/UI/IdentityPageModelConvention.cs rename to src/Identity/Identity/UI/src/IdentityPageModelConvention.cs diff --git a/src/Identity/src/UI/IdentityServiceCollectionUIExtensions.cs b/src/Identity/Identity/UI/src/IdentityServiceCollectionUIExtensions.cs similarity index 100% rename from src/Identity/src/UI/IdentityServiceCollectionUIExtensions.cs rename to src/Identity/Identity/UI/src/IdentityServiceCollectionUIExtensions.cs diff --git a/src/Identity/src/UI/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj similarity index 76% rename from src/Identity/src/UI/Microsoft.AspNetCore.Identity.UI.csproj rename to src/Identity/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj index 2795f6c76d..b21b83a1e1 100644 --- a/src/Identity/src/UI/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/Identity/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj @@ -1,5 +1,5 @@  - + ASP.NET Core Identity UI is the default Razor Pages built-in UI for the ASP.NET Core Identity framework. Compiled Razor views assembly for the ASP.NET Core Identity UI package. @@ -16,21 +16,17 @@ - - - - - - - - + - - + + + + + - + <_parameter1>Microsoft.AspNetCore.Mvc.AdditionalReference @@ -52,7 +48,7 @@ - + $(OutputPath)$(RazorTargetName).dll @@ -60,5 +56,5 @@ - + diff --git a/src/Identity/src/UI/THIRD-PARTY-NOTICES b/src/Identity/Identity/UI/src/THIRD-PARTY-NOTICES similarity index 100% rename from src/Identity/src/UI/THIRD-PARTY-NOTICES rename to src/Identity/Identity/UI/src/THIRD-PARTY-NOTICES diff --git a/src/Identity/src/UI/baseline.netcore.json b/src/Identity/Identity/UI/src/baseline.netcore.json similarity index 100% rename from src/Identity/src/UI/baseline.netcore.json rename to src/Identity/Identity/UI/src/baseline.netcore.json diff --git a/src/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.css b/src/Identity/Identity/UI/src/wwwroot/Identity/css/site.css similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.css rename to src/Identity/Identity/UI/src/wwwroot/Identity/css/site.css diff --git a/src/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.min.css b/src/Identity/Identity/UI/src/wwwroot/Identity/css/site.min.css similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.min.css rename to src/Identity/Identity/UI/src/wwwroot/Identity/css/site.min.css diff --git a/src/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.js b/src/Identity/Identity/UI/src/wwwroot/Identity/js/site.js similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/js/site.js diff --git a/src/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.min.js b/src/Identity/Identity/UI/src/wwwroot/Identity/js/site.min.js similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.min.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/js/site.min.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/.bower.json b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/.bower.json similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/.bower.json rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/.bower.json diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/LICENSE b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/LICENSE similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/LICENSE rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/LICENSE diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/js/npm.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/npm.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/bootstrap/dist/js/npm.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/npm.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/.bower.json b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/.bower.json similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/.bower.json rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/.bower.json diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/LICENSE.md b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/LICENSE.md similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/LICENSE.md rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/LICENSE.md diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery/.bower.json b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/.bower.json similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery/.bower.json rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/.bower.json diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery/LICENSE.txt b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/LICENSE.txt similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery/LICENSE.txt rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/LICENSE.txt diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery/dist/jquery.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery/dist/jquery.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery/dist/jquery.min.js b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery/dist/jquery.min.js rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.js diff --git a/src/Identity/src/UI/wwwroot/Identity/lib/jquery/dist/jquery.min.map b/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.map similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/lib/jquery/dist/jquery.min.map rename to src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.map diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewStart.cshtml b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewStart.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewStart.cshtml rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewStart.cshtml diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Controllers/HomeController.cs b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Controllers/HomeController.cs similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Controllers/HomeController.cs rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Controllers/HomeController.cs diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationDbContext.cs b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationDbContext.cs similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationDbContext.cs rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationDbContext.cs diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationUser.cs b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationUser.cs similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationUser.cs rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationUser.cs diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj b/src/Identity/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj new file mode 100644 index 0000000000..0ebffe7d49 --- /dev/null +++ b/src/Identity/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj @@ -0,0 +1,32 @@ + + + + Identity sample MVC application on ASP.NET Core using the default UI + netcoreapp2.1;net461 + aspnetcore-2ff9bc27-5e8c-4484-90ca-e3aace89b72a + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Program.cs b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Program.cs similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Program.cs rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Program.cs diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Startup.cs b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Startup.cs similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Startup.cs rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Startup.cs diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Views/Home/Index.cshtml b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Home/Index.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Views/Home/Index.cshtml rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Home/Index.cshtml diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/_ViewStart.cshtml b/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/_ViewStart.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/_ViewStart.cshtml rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/_ViewStart.cshtml diff --git a/src/Identity/samples/IdentitySample.DefaultUI/appsettings.json b/src/Identity/Identity/samples/IdentitySample.DefaultUI/appsettings.json similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/appsettings.json rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/appsettings.json diff --git a/src/Identity/samples/IdentitySample.DefaultUI/web.Debug.config b/src/Identity/Identity/samples/IdentitySample.DefaultUI/web.Debug.config similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/web.Debug.config rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/web.Debug.config diff --git a/src/Identity/samples/IdentitySample.DefaultUI/web.Release.config b/src/Identity/Identity/samples/IdentitySample.DefaultUI/web.Release.config similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/web.Release.config rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/web.Release.config diff --git a/src/Identity/samples/IdentitySample.DefaultUI/web.config b/src/Identity/Identity/samples/IdentitySample.DefaultUI/web.config similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/web.config rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/web.config diff --git a/src/Identity/src/UI/wwwroot/Identity/css/site.css b/src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.css similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/css/site.css rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.css diff --git a/src/Identity/src/UI/wwwroot/Identity/css/site.min.css b/src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.min.css similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/css/site.min.css rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.min.css diff --git a/src/Identity/samples/IdentitySample.DefaultUI/wwwroot/favicon.ico b/src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/favicon.ico similarity index 100% rename from src/Identity/samples/IdentitySample.DefaultUI/wwwroot/favicon.ico rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/favicon.ico diff --git a/src/Identity/src/UI/wwwroot/Identity/js/site.js b/src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/js/site.js rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.js diff --git a/src/Identity/src/UI/wwwroot/Identity/js/site.min.js b/src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.min.js similarity index 100% rename from src/Identity/src/UI/wwwroot/Identity/js/site.min.js rename to src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.min.js diff --git a/src/Identity/samples/IdentitySample.Mvc/Controllers/AccountController.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/AccountController.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Controllers/AccountController.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/AccountController.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Controllers/HomeController.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/HomeController.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Controllers/HomeController.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/HomeController.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Controllers/ManageController.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/ManageController.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Controllers/ManageController.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/ManageController.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd b/src/Identity/Identity/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd rename to src/Identity/Identity/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd diff --git a/src/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/src/Identity/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj new file mode 100644 index 0000000000..3df02383b4 --- /dev/null +++ b/src/Identity/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj @@ -0,0 +1,31 @@ + + + + Identity sample MVC application on ASP.NET Core + netcoreapp2.1;net461 + aspnetcore-b3d20cbe-418e-4bf2-a0f4-57f91d067e07 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Identity/samples/IdentitySample.Mvc/MessageServices.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/MessageServices.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/MessageServices.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/MessageServices.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/LoginViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/LoginViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/LoginViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/LoginViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/RegisterViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/RegisterViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/RegisterViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/RegisterViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ResetPasswordViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ResetPasswordViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ResetPasswordViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ResetPasswordViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/UseRecoveryCodeViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/UseRecoveryCodeViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/UseRecoveryCodeViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/UseRecoveryCodeViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyAuthenticatorCodeViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyAuthenticatorCodeViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyAuthenticatorCodeViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyAuthenticatorCodeViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyCodeViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyCodeViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyCodeViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyCodeViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ApplicationUser.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ApplicationUser.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ApplicationUser.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ApplicationUser.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/AddPhoneNumberViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/AddPhoneNumberViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/AddPhoneNumberViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ChangePasswordViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ChangePasswordViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ChangePasswordViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ChangePasswordViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/DisplayRecoveryCodesViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/DisplayRecoveryCodesViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/DisplayRecoveryCodesViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/DisplayRecoveryCodesViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/FactorViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/FactorViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/FactorViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/FactorViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/RemoveLoginViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/RemoveLoginViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/RemoveLoginViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/RemoveLoginViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/SetPasswordViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/SetPasswordViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/SetPasswordViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/SetPasswordViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Program.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Program.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Program.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Program.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Services/IEmailSender.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Services/IEmailSender.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Services/IEmailSender.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Services/IEmailSender.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Services/ISmsSender.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Services/ISmsSender.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Services/ISmsSender.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Services/ISmsSender.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Services/MessageServices.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Services/MessageServices.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Services/MessageServices.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Services/MessageServices.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Startup.cs b/src/Identity/Identity/samples/IdentitySample.Mvc/Startup.cs similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Startup.cs rename to src/Identity/Identity/samples/IdentitySample.Mvc/Startup.cs diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/Lockout.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Lockout.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/Lockout.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Lockout.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/Register.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Register.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/Register.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Register.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPasswordConfirmation.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPasswordConfirmation.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPasswordConfirmation.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPasswordConfirmation.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Home/Index.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Home/Index.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Home/Index.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Home/Index.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Manage/SetPassword.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/SetPassword.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Manage/SetPassword.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/SetPassword.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml diff --git a/src/Identity/src/UI/Areas/Identity/Pages/_ViewStart.cshtml b/src/Identity/Identity/samples/IdentitySample.Mvc/Views/_ViewStart.cshtml similarity index 100% rename from src/Identity/src/UI/Areas/Identity/Pages/_ViewStart.cshtml rename to src/Identity/Identity/samples/IdentitySample.Mvc/Views/_ViewStart.cshtml diff --git a/src/Identity/samples/IdentitySample.Mvc/appsettings.json b/src/Identity/Identity/samples/IdentitySample.Mvc/appsettings.json similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/appsettings.json rename to src/Identity/Identity/samples/IdentitySample.Mvc/appsettings.json diff --git a/src/Identity/samples/IdentitySample.Mvc/web.Debug.config b/src/Identity/Identity/samples/IdentitySample.Mvc/web.Debug.config similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/web.Debug.config rename to src/Identity/Identity/samples/IdentitySample.Mvc/web.Debug.config diff --git a/src/Identity/samples/IdentitySample.Mvc/web.Release.config b/src/Identity/Identity/samples/IdentitySample.Mvc/web.Release.config similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/web.Release.config rename to src/Identity/Identity/samples/IdentitySample.Mvc/web.Release.config diff --git a/src/Identity/samples/IdentitySample.Mvc/web.config b/src/Identity/Identity/samples/IdentitySample.Mvc/web.config similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/web.config rename to src/Identity/Identity/samples/IdentitySample.Mvc/web.config diff --git a/src/Identity/samples/IdentitySample.Mvc/wwwroot/css/site.css b/src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/css/site.css similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/wwwroot/css/site.css rename to src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/css/site.css diff --git a/src/Identity/samples/IdentitySample.Mvc/wwwroot/favicon.ico b/src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/favicon.ico similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/wwwroot/favicon.ico rename to src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/favicon.ico diff --git a/src/Identity/samples/IdentitySample.Mvc/wwwroot/js/site.js b/src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/js/site.js similarity index 100% rename from src/Identity/samples/IdentitySample.Mvc/wwwroot/js/site.js rename to src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/js/site.js diff --git a/src/Identity/samples/NativeWPFClient/App.config b/src/Identity/Identity/samples/NativeWPFClient/App.config similarity index 100% rename from src/Identity/samples/NativeWPFClient/App.config rename to src/Identity/Identity/samples/NativeWPFClient/App.config diff --git a/src/Identity/samples/NativeWPFClient/App.xaml b/src/Identity/Identity/samples/NativeWPFClient/App.xaml similarity index 100% rename from src/Identity/samples/NativeWPFClient/App.xaml rename to src/Identity/Identity/samples/NativeWPFClient/App.xaml diff --git a/src/Identity/samples/NativeWPFClient/App.xaml.cs b/src/Identity/Identity/samples/NativeWPFClient/App.xaml.cs similarity index 100% rename from src/Identity/samples/NativeWPFClient/App.xaml.cs rename to src/Identity/Identity/samples/NativeWPFClient/App.xaml.cs diff --git a/src/Identity/samples/NativeWPFClient/MainWindow.xaml b/src/Identity/Identity/samples/NativeWPFClient/MainWindow.xaml similarity index 100% rename from src/Identity/samples/NativeWPFClient/MainWindow.xaml rename to src/Identity/Identity/samples/NativeWPFClient/MainWindow.xaml diff --git a/src/Identity/samples/NativeWPFClient/MainWindow.xaml.cs b/src/Identity/Identity/samples/NativeWPFClient/MainWindow.xaml.cs similarity index 100% rename from src/Identity/samples/NativeWPFClient/MainWindow.xaml.cs rename to src/Identity/Identity/samples/NativeWPFClient/MainWindow.xaml.cs diff --git a/src/Identity/samples/NativeWPFClient/NativeWPFClient.csproj b/src/Identity/Identity/samples/NativeWPFClient/NativeWPFClient.csproj similarity index 100% rename from src/Identity/samples/NativeWPFClient/NativeWPFClient.csproj rename to src/Identity/Identity/samples/NativeWPFClient/NativeWPFClient.csproj diff --git a/src/Identity/samples/NativeWPFClient/Properties/AssemblyInfo.cs b/src/Identity/Identity/samples/NativeWPFClient/Properties/AssemblyInfo.cs similarity index 100% rename from src/Identity/samples/NativeWPFClient/Properties/AssemblyInfo.cs rename to src/Identity/Identity/samples/NativeWPFClient/Properties/AssemblyInfo.cs diff --git a/src/Identity/samples/NativeWPFClient/Properties/Resources.Designer.cs b/src/Identity/Identity/samples/NativeWPFClient/Properties/Resources.Designer.cs similarity index 100% rename from src/Identity/samples/NativeWPFClient/Properties/Resources.Designer.cs rename to src/Identity/Identity/samples/NativeWPFClient/Properties/Resources.Designer.cs diff --git a/src/Identity/samples/NativeWPFClient/Properties/Resources.resx b/src/Identity/Identity/samples/NativeWPFClient/Properties/Resources.resx similarity index 100% rename from src/Identity/samples/NativeWPFClient/Properties/Resources.resx rename to src/Identity/Identity/samples/NativeWPFClient/Properties/Resources.resx diff --git a/src/Identity/samples/NativeWPFClient/Properties/Settings.Designer.cs b/src/Identity/Identity/samples/NativeWPFClient/Properties/Settings.Designer.cs similarity index 100% rename from src/Identity/samples/NativeWPFClient/Properties/Settings.Designer.cs rename to src/Identity/Identity/samples/NativeWPFClient/Properties/Settings.Designer.cs diff --git a/src/Identity/samples/NativeWPFClient/Properties/Settings.settings b/src/Identity/Identity/samples/NativeWPFClient/Properties/Settings.settings similarity index 100% rename from src/Identity/samples/NativeWPFClient/Properties/Settings.settings rename to src/Identity/Identity/samples/NativeWPFClient/Properties/Settings.settings diff --git a/src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserAuthorizationTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserAuthorizationTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserAuthorizationTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserAuthorizationTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserLoginTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserLoginTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserLoginTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserLoginTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserManagementTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserManagementTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserManagementTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserManagementTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserRegistrationTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserRegistrationTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserRegistrationTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserRegistrationTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Extensions/HtmlAssert.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Extensions/HtmlAssert.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Extensions/HtmlAssert.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Extensions/HtmlAssert.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Extensions/HttpClientExtensions.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Extensions/HttpClientExtensions.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Extensions/HttpClientExtensions.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Extensions/HttpClientExtensions.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Extensions/ResponseAssert.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Extensions/ResponseAssert.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Extensions/ResponseAssert.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Extensions/ResponseAssert.cs diff --git a/src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserAuthorizationTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserAuthorizationTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserAuthorizationTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserAuthorizationTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserLoginTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserLoginTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserLoginTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserLoginTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserManagementTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserManagementTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserManagementTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserManagementTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserRegistrationTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserRegistrationTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserRegistrationTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserRegistrationTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIPage.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIPage.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIPage.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIPage.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPage.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPage.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPage.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPage.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPageContext.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPageContext.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPageContext.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPageContext.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs diff --git a/src/Identity/test/Identity.FunctionalTests/LoginTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/LoginTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/LoginTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/LoginTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/ManagementTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/ManagementTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/ManagementTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/ManagementTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj new file mode 100644 index 0000000000..3cb4e12dd6 --- /dev/null +++ b/src/Identity/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -0,0 +1,27 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/ConfirmEmail.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ConfirmEmail.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/ConfirmEmail.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ConfirmEmail.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPassword.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPassword.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPassword.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPassword.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPasswordConfirmation.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPasswordConfirmation.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPasswordConfirmation.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPasswordConfirmation.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWith2fa.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWith2fa.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWith2fa.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWith2fa.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWithRecoveryCode.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWithRecoveryCode.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWithRecoveryCode.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWithRecoveryCode.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ChangePassword.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ChangePassword.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ChangePassword.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ChangePassword.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/DeleteUser.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/DeleteUser.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/DeleteUser.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/DeleteUser.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/EnableAuthenticator.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/EnableAuthenticator.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/EnableAuthenticator.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/EnableAuthenticator.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/LinkExternalLogin.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/LinkExternalLogin.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/LinkExternalLogin.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/LinkExternalLogin.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ManageExternalLogin.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ManageExternalLogin.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ManageExternalLogin.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ManageExternalLogin.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/PersonalData.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/PersonalData.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/PersonalData.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/PersonalData.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/RemoveExternalLogin.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/RemoveExternalLogin.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/RemoveExternalLogin.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/RemoveExternalLogin.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ResetAuthenticator.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ResetAuthenticator.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ResetAuthenticator.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ResetAuthenticator.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/SetPassword.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/SetPassword.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/SetPassword.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/SetPassword.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ShowRecoveryCodes.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ShowRecoveryCodes.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ShowRecoveryCodes.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ShowRecoveryCodes.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/TwoFactorAuthentication.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/TwoFactorAuthentication.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/TwoFactorAuthentication.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/TwoFactorAuthentication.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPassword.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPassword.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPassword.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPassword.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPasswordConfirmation.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPasswordConfirmation.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPasswordConfirmation.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPasswordConfirmation.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Contoso/Login.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Contoso/Login.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Contoso/Login.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Contoso/Login.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Index.cs b/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Index.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/Pages/Index.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/Pages/Index.cs diff --git a/src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserAuthorizationTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserAuthorizationTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserAuthorizationTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserAuthorizationTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserLoginTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserLoginTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserLoginTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserLoginTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserManagementTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserManagementTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserManagementTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserManagementTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserRegistrationTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserRegistrationTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserRegistrationTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserRegistrationTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs b/src/Identity/Identity/test/Identity.FunctionalTests/RegistrationTests.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/RegistrationTests.cs diff --git a/src/Identity/test/Identity.FunctionalTests/UserStories.cs b/src/Identity/Identity/test/Identity.FunctionalTests/UserStories.cs similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/UserStories.cs rename to src/Identity/Identity/test/Identity.FunctionalTests/UserStories.cs diff --git a/src/Identity/test/Identity.FunctionalTests/xunit.runner.json b/src/Identity/Identity/test/Identity.FunctionalTests/xunit.runner.json similarity index 100% rename from src/Identity/test/Identity.FunctionalTests/xunit.runner.json rename to src/Identity/Identity/test/Identity.FunctionalTests/xunit.runner.json diff --git a/src/Identity/test/Identity.Test/ApiConsistencyTest.cs b/src/Identity/Identity/test/Identity.Test/ApiConsistencyTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/ApiConsistencyTest.cs rename to src/Identity/Identity/test/Identity.Test/ApiConsistencyTest.cs diff --git a/src/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs b/src/Identity/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs similarity index 98% rename from src/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs rename to src/Identity/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs index d9a6e57929..8b001bd8d7 100644 --- a/src/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs +++ b/src/Identity/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Identity.Test public async Task IdentityUI_ScriptTags_SubresourceIntegrityCheck() { var slnDir = GetSolutionDir(); - var sourceDir = Path.Combine(slnDir, "src", "UI"); + var sourceDir = Path.Combine(slnDir, "Identity", "UI"); var cshtmlFiles = Directory.GetFiles(sourceDir, "*.cshtml", SearchOption.AllDirectories); var scriptTags = new List(); diff --git a/src/Identity/test/Identity.Test/IdentityBuilderTest.cs b/src/Identity/Identity/test/Identity.Test/IdentityBuilderTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/IdentityBuilderTest.cs rename to src/Identity/Identity/test/Identity.Test/IdentityBuilderTest.cs diff --git a/src/Identity/test/Identity.Test/IdentityOptionsTest.cs b/src/Identity/Identity/test/Identity.Test/IdentityOptionsTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/IdentityOptionsTest.cs rename to src/Identity/Identity/test/Identity.Test/IdentityOptionsTest.cs diff --git a/src/Identity/test/Identity.Test/IdentityResultTest.cs b/src/Identity/Identity/test/Identity.Test/IdentityResultTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/IdentityResultTest.cs rename to src/Identity/Identity/test/Identity.Test/IdentityResultTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj new file mode 100644 index 0000000000..3a0ff854c3 --- /dev/null +++ b/src/Identity/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj @@ -0,0 +1,20 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + + diff --git a/src/Identity/test/Identity.Test/NoopRoleStore.cs b/src/Identity/Identity/test/Identity.Test/NoopRoleStore.cs similarity index 100% rename from src/Identity/test/Identity.Test/NoopRoleStore.cs rename to src/Identity/Identity/test/Identity.Test/NoopRoleStore.cs diff --git a/src/Identity/test/Identity.Test/NoopUserStore.cs b/src/Identity/Identity/test/Identity.Test/NoopUserStore.cs similarity index 100% rename from src/Identity/test/Identity.Test/NoopUserStore.cs rename to src/Identity/Identity/test/Identity.Test/NoopUserStore.cs diff --git a/src/Identity/test/Identity.Test/PasswordHasherTest.cs b/src/Identity/Identity/test/Identity.Test/PasswordHasherTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/PasswordHasherTest.cs rename to src/Identity/Identity/test/Identity.Test/PasswordHasherTest.cs diff --git a/src/Identity/test/Identity.Test/PasswordValidatorTest.cs b/src/Identity/Identity/test/Identity.Test/PasswordValidatorTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/PasswordValidatorTest.cs rename to src/Identity/Identity/test/Identity.Test/PasswordValidatorTest.cs diff --git a/src/Identity/test/Identity.Test/PrincipalExtensionsTest.cs b/src/Identity/Identity/test/Identity.Test/PrincipalExtensionsTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/PrincipalExtensionsTest.cs rename to src/Identity/Identity/test/Identity.Test/PrincipalExtensionsTest.cs diff --git a/src/Identity/test/Identity.Test/RoleManagerTest.cs b/src/Identity/Identity/test/Identity.Test/RoleManagerTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/RoleManagerTest.cs rename to src/Identity/Identity/test/Identity.Test/RoleManagerTest.cs diff --git a/src/Identity/test/Identity.Test/RoleValidatorTest.cs b/src/Identity/Identity/test/Identity.Test/RoleValidatorTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/RoleValidatorTest.cs rename to src/Identity/Identity/test/Identity.Test/RoleValidatorTest.cs diff --git a/src/Identity/test/Identity.Test/SecurityStampValidatorTest.cs b/src/Identity/Identity/test/Identity.Test/SecurityStampValidatorTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/SecurityStampValidatorTest.cs rename to src/Identity/Identity/test/Identity.Test/SecurityStampValidatorTest.cs diff --git a/src/Identity/test/Identity.Test/SignInManagerTest.cs b/src/Identity/Identity/test/Identity.Test/SignInManagerTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/SignInManagerTest.cs rename to src/Identity/Identity/test/Identity.Test/SignInManagerTest.cs diff --git a/src/Identity/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs b/src/Identity/Identity/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs rename to src/Identity/Identity/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs diff --git a/src/Identity/test/Identity.Test/UserManagerTest.cs b/src/Identity/Identity/test/Identity.Test/UserManagerTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/UserManagerTest.cs rename to src/Identity/Identity/test/Identity.Test/UserManagerTest.cs diff --git a/src/Identity/test/Identity.Test/UserValidatorTest.cs b/src/Identity/Identity/test/Identity.Test/UserValidatorTest.cs similarity index 100% rename from src/Identity/test/Identity.Test/UserValidatorTest.cs rename to src/Identity/Identity/test/Identity.Test/UserValidatorTest.cs diff --git a/src/Identity/test/InMemory.Test/ControllerTest.cs b/src/Identity/Identity/test/InMemory.Test/ControllerTest.cs similarity index 100% rename from src/Identity/test/InMemory.Test/ControllerTest.cs rename to src/Identity/Identity/test/InMemory.Test/ControllerTest.cs diff --git a/src/Identity/test/InMemory.Test/FunctionalTest.cs b/src/Identity/Identity/test/InMemory.Test/FunctionalTest.cs similarity index 100% rename from src/Identity/test/InMemory.Test/FunctionalTest.cs rename to src/Identity/Identity/test/InMemory.Test/FunctionalTest.cs diff --git a/src/Identity/test/InMemory.Test/InMemoryStore.cs b/src/Identity/Identity/test/InMemory.Test/InMemoryStore.cs similarity index 100% rename from src/Identity/test/InMemory.Test/InMemoryStore.cs rename to src/Identity/Identity/test/InMemory.Test/InMemoryStore.cs diff --git a/src/Identity/test/InMemory.Test/InMemoryStoreTest.cs b/src/Identity/Identity/test/InMemory.Test/InMemoryStoreTest.cs similarity index 100% rename from src/Identity/test/InMemory.Test/InMemoryStoreTest.cs rename to src/Identity/Identity/test/InMemory.Test/InMemoryStoreTest.cs diff --git a/src/Identity/test/InMemory.Test/InMemoryUserStore.cs b/src/Identity/Identity/test/InMemory.Test/InMemoryUserStore.cs similarity index 100% rename from src/Identity/test/InMemory.Test/InMemoryUserStore.cs rename to src/Identity/Identity/test/InMemory.Test/InMemoryUserStore.cs diff --git a/src/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs b/src/Identity/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs similarity index 100% rename from src/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs rename to src/Identity/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs diff --git a/src/Identity/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj b/src/Identity/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj new file mode 100644 index 0000000000..f8c9bd64f7 --- /dev/null +++ b/src/Identity/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj @@ -0,0 +1,19 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + diff --git a/src/Identity/test/InMemory.Test/TestClock.cs b/src/Identity/Identity/test/InMemory.Test/TestClock.cs similarity index 100% rename from src/Identity/test/InMemory.Test/TestClock.cs rename to src/Identity/Identity/test/InMemory.Test/TestClock.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj new file mode 100644 index 0000000000..bd140acdd5 --- /dev/null +++ b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj @@ -0,0 +1,44 @@ + + + + netcoreapp2.1;netcoreapp2.0;net461 + aspnet-Identity.DefaultUI.WebSite-80C658D8-CED7-467F-9B47-75DA3BC1A16D + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/NoIdentityStartup.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/NoIdentityStartup.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/NoIdentityStartup.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/NoIdentityStartup.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/About.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/About.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contact.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contact.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Error.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Error.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Index.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Index.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_CookieConsentPartial.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_CookieConsentPartial.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_CookieConsentPartial.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_CookieConsentPartial.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/PocoUser.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/PocoUser.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/PocoUser.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/PocoUser.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/PocoUserStartup.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/PocoUserStartup.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/PocoUserStartup.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/PocoUserStartup.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Program.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Program.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Program.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Program.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Startup.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Startup.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Startup.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Startup.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/StartupBase.cs b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/StartupBase.cs rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/appsettings.Development.json b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.Development.json similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/appsettings.Development.json rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.Development.json diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/appsettings.json b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.json similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/appsettings.json rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.json diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/bundleconfig.json b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/bundleconfig.json similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/bundleconfig.json rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/bundleconfig.json diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/css/site.css b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.css similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/css/site.css rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.css diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/css/site.min.css b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.min.css similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/css/site.min.css rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.min.css diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/favicon.ico b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/favicon.ico similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/favicon.ico rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/favicon.ico diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/images/banner1.svg b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner1.svg similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/images/banner1.svg rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner1.svg diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/images/banner2.svg b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner2.svg similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/images/banner2.svg rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner2.svg diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/images/banner3.svg b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner3.svg similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/images/banner3.svg rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner3.svg diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/images/banner4.svg b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner4.svg similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/images/banner4.svg rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner4.svg diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/js/site.js b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.js similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/js/site.js rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.js diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/js/site.min.js b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.min.js similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/js/site.min.js rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.min.js diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/.bower.json b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/.bower.json similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/.bower.json rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/.bower.json diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/.bower.json b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/.bower.json similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/.bower.json rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/.bower.json diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/.bower.json b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/.bower.json similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/.bower.json rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/.bower.json diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/.bower.json b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/.bower.json similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/.bower.json rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/.bower.json diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map b/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from src/Identity/test/WebSites/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map rename to src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/src/Identity/IdentityCore.sln b/src/Identity/IdentityCore.sln index 3971ae00b5..bb5b5d81c2 100644 --- a/src/Identity/IdentityCore.sln +++ b/src/Identity/IdentityCore.sln @@ -3,55 +3,89 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26730.10 MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0F647068-6602-4E24-B1DC-8ED91481A50A}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{C746D1C5-2031-486F-8C83-F89DFE1D6A3E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{52D59F18-62D2-4D17-8CF2-BE192445AF8E}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{C4104E84-CB85-49E3-BBC0-B765CB305788}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "src\Identity\Microsoft.AspNetCore.Identity.csproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{3BB08B4D-D000-4EC6-BC1F-35ED347390C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{F769B6CA-7E95-4067-A089-124D8C2944A1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{58D94A0E-C2B7-43A7-8826-99ECBB1E0A50}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{10A7B212-4571-40C4-AE10-E07F8B1B9F5C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "..\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{EB37060F-206D-4CC1-9A0C-9713CC624A8B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "test\EF.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{37236EA3-915D-46D5-997C-DF513C500E4B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "test\EF.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "src\EF\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{4490894C-3572-4E63-86F1-EE5105CE8A06}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{55754A06-7449-48BE-AE8B-BD8CF2AB2E21}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.Identity.AspNetCoreCompat", "src\AspNetCoreCompat\Microsoft.AspNet.Identity.AspNetCoreCompat.csproj", "{6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EF", "EF", "{D08D46D8-9703-48C1-BFBA-3026FDF8B03A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "src\Specification.Tests\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{5608E828-DD54-4E2A-B73C-FC22268BE797}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C76A75DA-21D0-42D4-ADA7-B367829F0963}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "src\Core\Microsoft.Extensions.Identity.Core.csproj", "{D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "EF\test\EF.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{4F129D0D-A12B-43CA-96AB-8C02C31863D1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "src\Stores\Microsoft.Extensions.Identity.Stores.csproj", "{FADA11FC-DC06-4832-A569-7B2374A6CD42}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "EF\test\EF.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{05005187-7F69-476B-924B-2696AF99C34B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2C657F6C-D8AD-4833-9C59-2301A16957BD}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "EF\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{D5FB2E24-4C71-430C-A289-59C8D59164B0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "src\UI\Microsoft.AspNetCore.Identity.UI.csproj", "{1FB3E9BB-E20A-4807-A4C3-F86A341304DB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "Extensions\Core\src\Microsoft.Extensions.Identity.Core.csproj", "{BAD15CD8-54DC-4060-A0D1-2DD890F65A41}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.FunctionalTests", "test\Identity.FunctionalTests\Microsoft.AspNetCore.Identity.FunctionalTests.csproj", "{BAC36757-9A47-43CB-A6F3-86E8C4650A28}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "Extensions\Stores\src\Microsoft.Extensions.Identity.Stores.csproj", "{63E0CB97-9992-4564-AB67-EF0122FDD93A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{C47C1165-9F19-4DF8-ABA9-707ACEB3BDC7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "Identity\Core\src\Microsoft.AspNetCore.Identity.csproj", "{3E91BC07-5930-4614-A19C-62077EF74574}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "test\WebSites\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{EA424B4D-0BE1-49AC-A106-CC6CC808A104}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5AB3E84F-F8BD-4F60-874F-4CFCC9B5335E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.FunctionalTests", "Identity\test\Identity.FunctionalTests\Microsoft.AspNetCore.Identity.FunctionalTests.csproj", "{E9C13855-BB94-4A28-8FBA-27484F74F100}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "Identity\test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{8C2DFD1D-5BBD-4224-BD54-832127892943}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "Identity\test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{87F29291-B977-4B1B-A7B9-8B3F74CAB081}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{58C2C86F-BB43-4A98-8F7C-F3ECF3B72E2F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "Identity\samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{08A09391-C518-4ACC-97BE-6A64070599AC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "Identity\samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj", "{92FDB538-5287-4A94-9262-C5D935300FA7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{9F3C759D-918D-49D9-8B4C-15AD8D02253B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "Identity\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{416B3E62-5539-4715-AF78-68F003B2D4C5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{8A79EE3B-995B-4D31-86FA-924BA25ACD26}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrite", "..\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj", "{F7039174-4368-4686-B9C6-69E89A7B8588}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{4A26A4AE-8688-41E8-8996-BAA22157A982}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{F1D10473-3132-4030-86FB-93344923EF34}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{A2279F48-5A05-424D-90ED-822E13B9725E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Facebook", "..\Security\Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj", "{2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "..\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj", "{AB29DA92-CC87-48DD-9FB7-60B6785B8A63}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Twitter", "..\Security\Authentication\Twitter\src\Microsoft.AspNetCore.Authentication.Twitter.csproj", "{46DB470A-4AC1-4C01-A638-395151DF6369}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{4D13F98D-9AA6-431A-B089-68A05D0CE5C7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{4D26E405-1C9D-4FA4-9F28-C608E5C82992}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -65,253 +99,593 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|x64.ActiveCfg = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|x64.Build.0 = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Debug|x86.ActiveCfg = Debug|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|Any CPU.Build.0 = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|x64.ActiveCfg = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|x64.Build.0 = Release|Any CPU - {1729302E-A58E-4652-B639-5B6B68DA2748}.Release|x86.ActiveCfg = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|x64.ActiveCfg = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|x64.Build.0 = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|x86.ActiveCfg = Debug|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|Any CPU.Build.0 = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|x64.ActiveCfg = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|x64.Build.0 = Release|Any CPU - {2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Release|x86.ActiveCfg = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|x64.ActiveCfg = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|x64.Build.0 = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Debug|x86.ActiveCfg = Debug|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|Any CPU.Build.0 = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|x64.ActiveCfg = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|x64.Build.0 = Release|Any CPU - {65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|x86.ActiveCfg = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|x64.ActiveCfg = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|x64.Build.0 = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|x86.ActiveCfg = Debug|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|Any CPU.Build.0 = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|x64.ActiveCfg = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|x64.Build.0 = Release|Any CPU - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|x86.ActiveCfg = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|x64.ActiveCfg = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|x64.Build.0 = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|x86.ActiveCfg = Debug|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|Any CPU.Build.0 = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|x64.ActiveCfg = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|x64.Build.0 = Release|Any CPU - {37236EA3-915D-46D5-997C-DF513C500E4B}.Release|x86.ActiveCfg = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|x64.ActiveCfg = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|x64.Build.0 = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|x86.ActiveCfg = Debug|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|Any CPU.Build.0 = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|x64.ActiveCfg = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|x64.Build.0 = Release|Any CPU - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|x86.ActiveCfg = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|x64.ActiveCfg = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|x64.Build.0 = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|x86.ActiveCfg = Debug|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Any CPU.Build.0 = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|x64.ActiveCfg = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|x64.Build.0 = Release|Any CPU - {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|x86.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|x64.ActiveCfg = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|x64.Build.0 = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|x86.ActiveCfg = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|x86.Build.0 = Debug|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|Any CPU.Build.0 = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|x64.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|x64.Build.0 = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|x86.ActiveCfg = Release|Any CPU - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|x86.Build.0 = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|x64.ActiveCfg = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|x64.Build.0 = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|x86.ActiveCfg = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Debug|x86.Build.0 = Debug|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|Any CPU.Build.0 = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|x64.ActiveCfg = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|x64.Build.0 = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|x86.ActiveCfg = Release|Any CPU - {5608E828-DD54-4E2A-B73C-FC22268BE797}.Release|x86.Build.0 = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|x64.ActiveCfg = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|x64.Build.0 = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|x86.ActiveCfg = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Debug|x86.Build.0 = Debug|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|Any CPU.Build.0 = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|x64.ActiveCfg = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|x64.Build.0 = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|x86.ActiveCfg = Release|Any CPU - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8}.Release|x86.Build.0 = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|x64.ActiveCfg = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|x64.Build.0 = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|x86.ActiveCfg = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Debug|x86.Build.0 = Debug|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|Any CPU.Build.0 = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|x64.ActiveCfg = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|x64.Build.0 = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|x86.ActiveCfg = Release|Any CPU - {FADA11FC-DC06-4832-A569-7B2374A6CD42}.Release|x86.Build.0 = Release|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Debug|x64.ActiveCfg = Debug|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Debug|x64.Build.0 = Debug|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Debug|x86.ActiveCfg = Debug|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Debug|x86.Build.0 = Debug|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Release|Any CPU.Build.0 = Release|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Release|x64.ActiveCfg = Release|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Release|x64.Build.0 = Release|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Release|x86.ActiveCfg = Release|Any CPU - {D5FB2E24-4C71-430C-A289-59C8D59164B0}.Release|x86.Build.0 = Release|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Debug|x64.ActiveCfg = Debug|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Debug|x64.Build.0 = Debug|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Debug|x86.ActiveCfg = Debug|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Debug|x86.Build.0 = Debug|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Release|Any CPU.Build.0 = Release|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Release|x64.ActiveCfg = Release|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Release|x64.Build.0 = Release|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Release|x86.ActiveCfg = Release|Any CPU - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB}.Release|x86.Build.0 = Release|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Debug|x64.ActiveCfg = Debug|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Debug|x64.Build.0 = Debug|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Debug|x86.ActiveCfg = Debug|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Debug|x86.Build.0 = Debug|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Release|Any CPU.Build.0 = Release|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Release|x64.ActiveCfg = Release|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Release|x64.Build.0 = Release|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Release|x86.ActiveCfg = Release|Any CPU - {BAC36757-9A47-43CB-A6F3-86E8C4650A28}.Release|x86.Build.0 = Release|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Debug|x64.ActiveCfg = Debug|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Debug|x64.Build.0 = Debug|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Debug|x86.ActiveCfg = Debug|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Debug|x86.Build.0 = Debug|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Release|Any CPU.Build.0 = Release|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Release|x64.ActiveCfg = Release|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Release|x64.Build.0 = Release|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Release|x86.ActiveCfg = Release|Any CPU - {EA424B4D-0BE1-49AC-A106-CC6CC808A104}.Release|x86.Build.0 = Release|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|x64.ActiveCfg = Debug|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|x64.Build.0 = Debug|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|x86.ActiveCfg = Debug|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|x86.Build.0 = Debug|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|Any CPU.Build.0 = Release|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|x64.ActiveCfg = Release|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|x64.Build.0 = Release|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|x86.ActiveCfg = Release|Any CPU + {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|x86.Build.0 = Release|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|x64.ActiveCfg = Debug|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|x64.Build.0 = Debug|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|x86.ActiveCfg = Debug|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|x86.Build.0 = Debug|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|Any CPU.Build.0 = Release|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|x64.ActiveCfg = Release|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|x64.Build.0 = Release|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|x86.ActiveCfg = Release|Any CPU + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|x86.Build.0 = Release|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|x64.ActiveCfg = Debug|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|x64.Build.0 = Debug|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|x86.ActiveCfg = Debug|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|x86.Build.0 = Debug|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|Any CPU.Build.0 = Release|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|x64.ActiveCfg = Release|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|x64.Build.0 = Release|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|x86.ActiveCfg = Release|Any CPU + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|x86.Build.0 = Release|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|x64.ActiveCfg = Debug|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|x64.Build.0 = Debug|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|x86.ActiveCfg = Debug|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|x86.Build.0 = Debug|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|Any CPU.Build.0 = Release|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|x64.ActiveCfg = Release|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|x64.Build.0 = Release|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|x86.ActiveCfg = Release|Any CPU + {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|x86.Build.0 = Release|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|x64.ActiveCfg = Debug|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|x64.Build.0 = Debug|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|x86.ActiveCfg = Debug|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|x86.Build.0 = Debug|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|Any CPU.Build.0 = Release|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|x64.ActiveCfg = Release|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|x64.Build.0 = Release|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|x86.ActiveCfg = Release|Any CPU + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|x86.Build.0 = Release|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|x64.ActiveCfg = Debug|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|x64.Build.0 = Debug|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|x86.ActiveCfg = Debug|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|x86.Build.0 = Debug|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|Any CPU.Build.0 = Release|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|x64.ActiveCfg = Release|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|x64.Build.0 = Release|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|x86.ActiveCfg = Release|Any CPU + {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|x86.Build.0 = Release|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|x64.ActiveCfg = Debug|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|x64.Build.0 = Debug|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|x86.ActiveCfg = Debug|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|x86.Build.0 = Debug|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|Any CPU.Build.0 = Release|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|x64.ActiveCfg = Release|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|x64.Build.0 = Release|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|x86.ActiveCfg = Release|Any CPU + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|x86.Build.0 = Release|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|x64.ActiveCfg = Debug|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|x64.Build.0 = Debug|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|x86.ActiveCfg = Debug|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|x86.Build.0 = Debug|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|Any CPU.Build.0 = Release|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|x64.ActiveCfg = Release|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|x64.Build.0 = Release|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|x86.ActiveCfg = Release|Any CPU + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|x86.Build.0 = Release|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|x64.ActiveCfg = Debug|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|x64.Build.0 = Debug|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|x86.ActiveCfg = Debug|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|x86.Build.0 = Debug|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|Any CPU.Build.0 = Release|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|x64.ActiveCfg = Release|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|x64.Build.0 = Release|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|x86.ActiveCfg = Release|Any CPU + {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|x86.Build.0 = Release|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Debug|x64.ActiveCfg = Debug|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Debug|x64.Build.0 = Debug|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Debug|x86.ActiveCfg = Debug|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Debug|x86.Build.0 = Debug|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Release|Any CPU.Build.0 = Release|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Release|x64.ActiveCfg = Release|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Release|x64.Build.0 = Release|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Release|x86.ActiveCfg = Release|Any CPU + {05005187-7F69-476B-924B-2696AF99C34B}.Release|x86.Build.0 = Release|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|x64.ActiveCfg = Debug|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|x64.Build.0 = Debug|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|x86.ActiveCfg = Debug|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|x86.Build.0 = Debug|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|Any CPU.Build.0 = Release|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|x64.ActiveCfg = Release|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|x64.Build.0 = Release|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|x86.ActiveCfg = Release|Any CPU + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|x86.Build.0 = Release|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|x64.ActiveCfg = Debug|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|x64.Build.0 = Debug|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|x86.ActiveCfg = Debug|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|x86.Build.0 = Debug|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|Any CPU.Build.0 = Release|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|x64.ActiveCfg = Release|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|x64.Build.0 = Release|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|x86.ActiveCfg = Release|Any CPU + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|x86.Build.0 = Release|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|x64.ActiveCfg = Debug|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|x64.Build.0 = Debug|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|x86.ActiveCfg = Debug|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|x86.Build.0 = Debug|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|Any CPU.Build.0 = Release|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|x64.ActiveCfg = Release|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|x64.Build.0 = Release|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|x86.ActiveCfg = Release|Any CPU + {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|x86.Build.0 = Release|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|x64.ActiveCfg = Debug|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|x64.Build.0 = Debug|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|x86.ActiveCfg = Debug|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|x86.Build.0 = Debug|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Release|Any CPU.Build.0 = Release|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Release|x64.ActiveCfg = Release|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Release|x64.Build.0 = Release|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Release|x86.ActiveCfg = Release|Any CPU + {3E91BC07-5930-4614-A19C-62077EF74574}.Release|x86.Build.0 = Release|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|x64.ActiveCfg = Debug|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|x64.Build.0 = Debug|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|x86.ActiveCfg = Debug|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|x86.Build.0 = Debug|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|Any CPU.Build.0 = Release|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|x64.ActiveCfg = Release|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|x64.Build.0 = Release|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|x86.ActiveCfg = Release|Any CPU + {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|x86.Build.0 = Release|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|x64.ActiveCfg = Debug|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|x64.Build.0 = Debug|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|x86.ActiveCfg = Debug|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|x86.Build.0 = Debug|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|Any CPU.Build.0 = Release|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|x64.ActiveCfg = Release|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|x64.Build.0 = Release|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|x86.ActiveCfg = Release|Any CPU + {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|x86.Build.0 = Release|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|x64.ActiveCfg = Debug|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|x64.Build.0 = Debug|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|x86.ActiveCfg = Debug|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|x86.Build.0 = Debug|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|Any CPU.Build.0 = Release|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|x64.ActiveCfg = Release|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|x64.Build.0 = Release|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|x86.ActiveCfg = Release|Any CPU + {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|x86.Build.0 = Release|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|x64.ActiveCfg = Debug|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|x64.Build.0 = Debug|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|x86.ActiveCfg = Debug|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|x86.Build.0 = Debug|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|Any CPU.Build.0 = Release|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|x64.ActiveCfg = Release|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|x64.Build.0 = Release|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|x86.ActiveCfg = Release|Any CPU + {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|x86.Build.0 = Release|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|x64.ActiveCfg = Debug|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|x64.Build.0 = Debug|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|x86.ActiveCfg = Debug|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|x86.Build.0 = Debug|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|Any CPU.Build.0 = Release|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|x64.ActiveCfg = Release|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|x64.Build.0 = Release|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|x86.ActiveCfg = Release|Any CPU + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|x86.Build.0 = Release|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|x64.ActiveCfg = Debug|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|x64.Build.0 = Debug|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|x86.ActiveCfg = Debug|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|x86.Build.0 = Debug|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|Any CPU.Build.0 = Release|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|x64.ActiveCfg = Release|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|x64.Build.0 = Release|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|x86.ActiveCfg = Release|Any CPU + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|x86.Build.0 = Release|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|x64.ActiveCfg = Debug|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|x64.Build.0 = Debug|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|x86.ActiveCfg = Debug|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|x86.Build.0 = Debug|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|Any CPU.Build.0 = Release|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|x64.ActiveCfg = Release|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|x64.Build.0 = Release|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|x86.ActiveCfg = Release|Any CPU + {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|x86.Build.0 = Release|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|x64.ActiveCfg = Debug|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|x64.Build.0 = Debug|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|x86.ActiveCfg = Debug|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|x86.Build.0 = Debug|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|Any CPU.Build.0 = Release|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|x64.ActiveCfg = Release|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|x64.Build.0 = Release|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|x86.ActiveCfg = Release|Any CPU + {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|x86.Build.0 = Release|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|x64.ActiveCfg = Debug|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|x64.Build.0 = Debug|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|x86.ActiveCfg = Debug|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|x86.Build.0 = Debug|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|Any CPU.Build.0 = Release|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|x64.ActiveCfg = Release|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|x64.Build.0 = Release|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|x86.ActiveCfg = Release|Any CPU + {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|x86.Build.0 = Release|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|x64.ActiveCfg = Debug|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|x64.Build.0 = Debug|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|x86.ActiveCfg = Debug|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|x86.Build.0 = Debug|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|Any CPU.Build.0 = Release|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|x64.ActiveCfg = Release|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|x64.Build.0 = Release|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|x86.ActiveCfg = Release|Any CPU + {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|x86.Build.0 = Release|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|x64.ActiveCfg = Debug|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|x64.Build.0 = Debug|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|x86.ActiveCfg = Debug|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|x86.Build.0 = Debug|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|Any CPU.Build.0 = Release|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|x64.ActiveCfg = Release|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|x64.Build.0 = Release|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|x86.ActiveCfg = Release|Any CPU + {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|x86.Build.0 = Release|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Debug|x64.ActiveCfg = Debug|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Debug|x64.Build.0 = Debug|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Debug|x86.ActiveCfg = Debug|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Debug|x86.Build.0 = Debug|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Release|Any CPU.Build.0 = Release|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Release|x64.ActiveCfg = Release|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Release|x64.Build.0 = Release|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Release|x86.ActiveCfg = Release|Any CPU + {F1D10473-3132-4030-86FB-93344923EF34}.Release|x86.Build.0 = Release|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|x64.ActiveCfg = Debug|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|x64.Build.0 = Debug|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|x86.ActiveCfg = Debug|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|x86.Build.0 = Debug|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|Any CPU.Build.0 = Release|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|x64.ActiveCfg = Release|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|x64.Build.0 = Release|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|x86.ActiveCfg = Release|Any CPU + {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|x86.Build.0 = Release|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|x64.ActiveCfg = Debug|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|x64.Build.0 = Debug|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|x86.ActiveCfg = Debug|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|x86.Build.0 = Debug|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|Any CPU.Build.0 = Release|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|x64.ActiveCfg = Release|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|x64.Build.0 = Release|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|x86.ActiveCfg = Release|Any CPU + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|x86.Build.0 = Release|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|x64.ActiveCfg = Debug|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|x64.Build.0 = Debug|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|x86.ActiveCfg = Debug|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|x86.Build.0 = Debug|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|Any CPU.Build.0 = Release|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|x64.ActiveCfg = Release|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|x64.Build.0 = Release|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|x86.ActiveCfg = Release|Any CPU + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|x86.Build.0 = Release|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|Any CPU.Build.0 = Debug|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|x64.ActiveCfg = Debug|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|x64.Build.0 = Debug|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|x86.ActiveCfg = Debug|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|x86.Build.0 = Debug|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|Any CPU.ActiveCfg = Release|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|Any CPU.Build.0 = Release|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|x64.ActiveCfg = Release|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|x64.Build.0 = Release|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|x86.ActiveCfg = Release|Any CPU + {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|x86.Build.0 = Release|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|x64.ActiveCfg = Debug|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|x64.Build.0 = Debug|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|x86.ActiveCfg = Debug|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|x86.Build.0 = Debug|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|Any CPU.Build.0 = Release|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|x64.ActiveCfg = Release|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|x64.Build.0 = Release|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|x86.ActiveCfg = Release|Any CPU + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|x86.Build.0 = Release|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|x64.ActiveCfg = Debug|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|x64.Build.0 = Debug|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|x86.ActiveCfg = Debug|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|x86.Build.0 = Debug|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|Any CPU.Build.0 = Release|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|x64.ActiveCfg = Release|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|x64.Build.0 = Release|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|x86.ActiveCfg = Release|Any CPU + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|x86.Build.0 = Release|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|x64.ActiveCfg = Debug|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|x64.Build.0 = Debug|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|x86.ActiveCfg = Debug|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|x86.Build.0 = Debug|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|Any CPU.Build.0 = Release|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|x64.ActiveCfg = Release|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|x64.Build.0 = Release|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|x86.ActiveCfg = Release|Any CPU + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|x86.Build.0 = Release|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|x64.ActiveCfg = Debug|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|x64.Build.0 = Debug|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|x86.ActiveCfg = Debug|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|x86.Build.0 = Debug|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|Any CPU.Build.0 = Release|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|x64.ActiveCfg = Release|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|x64.Build.0 = Release|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|x86.ActiveCfg = Release|Any CPU + {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1729302E-A58E-4652-B639-5B6B68DA2748} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {2CF3927B-19E4-4866-9BAA-2C131580E7C3} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {65161409-C4C4-4D63-A73B-231FCFF4D503} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6} = {58D94A0E-C2B7-43A7-8826-99ECBB1E0A50} - {37236EA3-915D-46D5-997C-DF513C500E4B} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {4490894C-3572-4E63-86F1-EE5105CE8A06} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {5608E828-DD54-4E2A-B73C-FC22268BE797} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {D5905D78-A32E-44B8-8F21-EDAEDC95D9B8} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {FADA11FC-DC06-4832-A569-7B2374A6CD42} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {D5FB2E24-4C71-430C-A289-59C8D59164B0} = {58D94A0E-C2B7-43A7-8826-99ECBB1E0A50} - {1FB3E9BB-E20A-4807-A4C3-F86A341304DB} = {0F647068-6602-4E24-B1DC-8ED91481A50A} - {BAC36757-9A47-43CB-A6F3-86E8C4650A28} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {C47C1165-9F19-4DF8-ABA9-707ACEB3BDC7} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} - {EA424B4D-0BE1-49AC-A106-CC6CC808A104} = {C47C1165-9F19-4DF8-ABA9-707ACEB3BDC7} + {C4104E84-CB85-49E3-BBC0-B765CB305788} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {3BB08B4D-D000-4EC6-BC1F-35ED347390C1} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {F769B6CA-7E95-4067-A089-124D8C2944A1} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {10A7B212-4571-40C4-AE10-E07F8B1B9F5C} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {EB37060F-206D-4CC1-9A0C-9713CC624A8B} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {C76A75DA-21D0-42D4-ADA7-B367829F0963} = {D08D46D8-9703-48C1-BFBA-3026FDF8B03A} + {4F129D0D-A12B-43CA-96AB-8C02C31863D1} = {C76A75DA-21D0-42D4-ADA7-B367829F0963} + {05005187-7F69-476B-924B-2696AF99C34B} = {C76A75DA-21D0-42D4-ADA7-B367829F0963} + {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A} = {D08D46D8-9703-48C1-BFBA-3026FDF8B03A} + {BAD15CD8-54DC-4060-A0D1-2DD890F65A41} = {55754A06-7449-48BE-AE8B-BD8CF2AB2E21} + {63E0CB97-9992-4564-AB67-EF0122FDD93A} = {55754A06-7449-48BE-AE8B-BD8CF2AB2E21} + {3E91BC07-5930-4614-A19C-62077EF74574} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} + {5AB3E84F-F8BD-4F60-874F-4CFCC9B5335E} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} + {E9C13855-BB94-4A28-8FBA-27484F74F100} = {5AB3E84F-F8BD-4F60-874F-4CFCC9B5335E} + {8C2DFD1D-5BBD-4224-BD54-832127892943} = {5AB3E84F-F8BD-4F60-874F-4CFCC9B5335E} + {87F29291-B977-4B1B-A7B9-8B3F74CAB081} = {5AB3E84F-F8BD-4F60-874F-4CFCC9B5335E} + {58C2C86F-BB43-4A98-8F7C-F3ECF3B72E2F} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} + {08A09391-C518-4ACC-97BE-6A64070599AC} = {58C2C86F-BB43-4A98-8F7C-F3ECF3B72E2F} + {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} + {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5} = {58C2C86F-BB43-4A98-8F7C-F3ECF3B72E2F} + {92FDB538-5287-4A94-9262-C5D935300FA7} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} + {9F3C759D-918D-49D9-8B4C-15AD8D02253B} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} + {416B3E62-5539-4715-AF78-68F003B2D4C5} = {9F3C759D-918D-49D9-8B4C-15AD8D02253B} + {8A79EE3B-995B-4D31-86FA-924BA25ACD26} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {F7039174-4368-4686-B9C6-69E89A7B8588} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {4A26A4AE-8688-41E8-8996-BAA22157A982} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {F1D10473-3132-4030-86FB-93344923EF34} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {A2279F48-5A05-424D-90ED-822E13B9725E} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {AB29DA92-CC87-48DD-9FB7-60B6785B8A63} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {46DB470A-4AC1-4C01-A638-395151DF6369} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {4D13F98D-9AA6-431A-B089-68A05D0CE5C7} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} + {4D26E405-1C9D-4FA4-9F28-C608E5C82992} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {21D598B0-2383-4B22-826D-E7FB4921BD66} diff --git a/src/Identity/NuGetPackageVerifier.json b/src/Identity/NuGetPackageVerifier.json deleted file mode 100644 index df04266b02..0000000000 --- a/src/Identity/NuGetPackageVerifier.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ], - "packages": { - "Microsoft.AspNetCore.Identity.UI": { - "Exclusions": { - "DOC_MISSING": { - "lib/netstandard2.0/Microsoft.AspNetCore.Identity.UI.dll": "This is a library with packaged UI", - "lib/netstandard2.0/Microsoft.AspNetCore.Identity.UI.Views.dll": "This assembly is generated and contains precompiled razor pages" - } - } - } - } - } -} diff --git a/src/Identity/test/Shared/ApiConsistencyTestBase.cs b/src/Identity/Shared/ApiConsistencyTestBase.cs similarity index 100% rename from src/Identity/test/Shared/ApiConsistencyTestBase.cs rename to src/Identity/Shared/ApiConsistencyTestBase.cs diff --git a/src/Identity/test/Shared/MockHelpers.cs b/src/Identity/Shared/MockHelpers.cs similarity index 100% rename from src/Identity/test/Shared/MockHelpers.cs rename to src/Identity/Shared/MockHelpers.cs diff --git a/src/Identity/test/Shared/PocoRole.cs b/src/Identity/Shared/PocoRole.cs similarity index 100% rename from src/Identity/test/Shared/PocoRole.cs rename to src/Identity/Shared/PocoRole.cs diff --git a/src/Identity/test/Shared/PocoRoleClaim.cs b/src/Identity/Shared/PocoRoleClaim.cs similarity index 100% rename from src/Identity/test/Shared/PocoRoleClaim.cs rename to src/Identity/Shared/PocoRoleClaim.cs diff --git a/src/Identity/test/Shared/PocoUser.cs b/src/Identity/Shared/PocoUser.cs similarity index 100% rename from src/Identity/test/Shared/PocoUser.cs rename to src/Identity/Shared/PocoUser.cs diff --git a/src/Identity/test/Shared/PocoUserClaim.cs b/src/Identity/Shared/PocoUserClaim.cs similarity index 100% rename from src/Identity/test/Shared/PocoUserClaim.cs rename to src/Identity/Shared/PocoUserClaim.cs diff --git a/src/Identity/test/Shared/PocoUserLogin.cs b/src/Identity/Shared/PocoUserLogin.cs similarity index 100% rename from src/Identity/test/Shared/PocoUserLogin.cs rename to src/Identity/Shared/PocoUserLogin.cs diff --git a/src/Identity/test/Shared/PocoUserRole.cs b/src/Identity/Shared/PocoUserRole.cs similarity index 100% rename from src/Identity/test/Shared/PocoUserRole.cs rename to src/Identity/Shared/PocoUserRole.cs diff --git a/src/Identity/test/Shared/PocoUserToken.cs b/src/Identity/Shared/PocoUserToken.cs similarity index 100% rename from src/Identity/test/Shared/PocoUserToken.cs rename to src/Identity/Shared/PocoUserToken.cs diff --git a/src/Identity/test/Shared/PriorityOrderer.cs b/src/Identity/Shared/PriorityOrderer.cs similarity index 100% rename from src/Identity/test/Shared/PriorityOrderer.cs rename to src/Identity/Shared/PriorityOrderer.cs diff --git a/src/Identity/build/Key.snk b/src/Identity/build/Key.snk deleted file mode 100644 index e10e4889c125d3120cd9e81582243d70f7cbb806..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098=Iw=HCsnz~#iVhm& zj%TU(_THUee?3yHBjk$37ysB?i5#7WD$={H zV4B!OxRPrb|8)HPg~A}8P>^=#y<)56#=E&NzcjOtPK~<4n6GHt=K$ro*T(lhby_@U zEk(hLzk1H)0yXj{A_5>fk-TgNoP|q6(tP2xo8zt8i%212CWM#AeCd?`hS|4~L({h~Moo(~vy&3Z z1uI}`fd^*>o=rwbAGymj6RM^pZm(*Kfhs+Y1#`-2JPWZMK8@;ZWCk2+9bX4YP);~fj-BU*R zQPvWv$89!{Rl9wM+zR>_TSkn^voYxA?2G iKnV#iZ6Ah`K>b=@=IjYJXrxL124zR(38)nxe+&q_$QXwJ diff --git a/src/Identity/build/dependencies.props b/src/Identity/build/dependencies.props deleted file mode 100644 index 3ae698e9d8..0000000000 --- a/src/Identity/build/dependencies.props +++ /dev/null @@ -1,79 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 0.9.9 - 2.1.3-rtm-15831 - 2.2.1 - 2.0.0 - 2.1.5 - 15.6.1 - 3.0.1 - 4.7.49 - 2.0.3 - 4.5.0 - 0.8.0 - 2.3.1 - 2.4.0 - - - - - - - - 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.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.0 - 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.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 - - diff --git a/src/Identity/build/repo.props b/src/Identity/build/repo.props deleted file mode 100644 index 07b7cc25b0..0000000000 --- a/src/Identity/build/repo.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/Identity/build/repo.targets b/src/Identity/build/repo.targets deleted file mode 100644 index 867ea2537a..0000000000 --- a/src/Identity/build/repo.targets +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Configuration=$(Configuration)NoWPF - - - diff --git a/src/Identity/build/sources.props b/src/Identity/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/Identity/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/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj b/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj deleted file mode 100644 index 43b55a62d9..0000000000 --- a/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - Identity sample MVC application on ASP.NET Core using the default UI - netcoreapp2.1;net461 - aspnetcore-2ff9bc27-5e8c-4484-90ca-e3aace89b72a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Properties/launchSettings.json b/src/Identity/samples/IdentitySample.DefaultUI/Properties/launchSettings.json deleted file mode 100644 index cef8aeebde..0000000000 --- a/src/Identity/samples/IdentitySample.DefaultUI/Properties/launchSettings.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:28248/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "web": { - "commandName": "web", - "environmentVariables": { - "ASPNET_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj deleted file mode 100644 index 07074aac42..0000000000 --- a/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - Identity sample MVC application on ASP.NET Core - netcoreapp2.1;net461 - aspnetcore-b3d20cbe-418e-4bf2-a0f4-57f91d067e07 - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Identity/samples/IdentitySample.Mvc/Properties/launchSettings.json b/src/Identity/samples/IdentitySample.Mvc/Properties/launchSettings.json deleted file mode 100644 index 503bada5ef..0000000000 --- a/src/Identity/samples/IdentitySample.Mvc/Properties/launchSettings.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:51567/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "web": { - "commandName": "web", - "environmentVariables": { - "ASPNET_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/Identity/src/AspNetCoreCompat/CookieInterop.cs b/src/Identity/src/AspNetCoreCompat/CookieInterop.cs deleted file mode 100644 index 593c50ee77..0000000000 --- a/src/Identity/src/AspNetCoreCompat/CookieInterop.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using Microsoft.AspNetCore.DataProtection; -using Microsoft.Owin.Security; -using Microsoft.Owin.Security.Interop; - -namespace Owin -{ - public static class CookieInterop - { - public static ISecureDataFormat CreateSharedDataFormat(DirectoryInfo keyDirectory, string authenticationType) - { - var dataProtector = DataProtectionProvider.Create(keyDirectory) - .CreateProtector("Microsoft.AspNetCore.Authentication.Cookies.CookieAuthenticationMiddleware", // full name of the ASP.NET 5 type - authenticationType, "v2"); - return new AspNetTicketDataFormat(new DataProtectorShim(dataProtector)); - } - } -} \ No newline at end of file diff --git a/src/Identity/src/AspNetCoreCompat/IdentityDbContext.cs b/src/Identity/src/AspNetCoreCompat/IdentityDbContext.cs deleted file mode 100644 index e773e39574..0000000000 --- a/src/Identity/src/AspNetCoreCompat/IdentityDbContext.cs +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright (c) Microsoft Corporation, Inc. All rights reserved. -// Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Data.Common; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; -using System.Data.Entity.Validation; -using Microsoft.AspNet.Identity.EntityFramework; - -namespace Microsoft.AspNet.Identity.CoreCompat -{ - public class IdentityDbContext : - IdentityDbContext - where TUser : IdentityUser - { - public IdentityDbContext() : base() - { - - } - - public IdentityDbContext(DbCompiledModel model) - : base(model) - { - - } - - public IdentityDbContext(string nameOrConnectionString) - : base(nameOrConnectionString) - { - - } - - public IdentityDbContext(string nameOrConnectionString, DbCompiledModel model) - : base(nameOrConnectionString, model) - { - - } - - public IdentityDbContext(DbConnection existingConnection, bool contextOwnsConnection) - : base(existingConnection, contextOwnsConnection) - { - - } - // - // Summary: - // Constructs a new context instance using the existing connection to connect to - // a database, and initializes it from the given model. The connection will not - // be disposed when the context is disposed if contextOwnsConnection is false. - // - // Parameters: - // existingConnection: - // An existing connection to use for the new context. - // - // model: - // The model that will back this context. - // - // contextOwnsConnection: - // Constructs a new context instance using the existing connection to connect to - // a database, and initializes it from the given model. The connection will not - // be disposed when the context is disposed if contextOwnsConnection is false. - public IdentityDbContext(DbConnection existingConnection, DbCompiledModel model, bool contextOwnsConnection) - : base(existingConnection, model, contextOwnsConnection) - { - } - } - - public class IdentityDbContext : - IdentityDbContext - where TUser : IdentityUser - where TRole : IdentityRole - where TUserLogin : IdentityUserLogin - where TUserRole : IdentityUserRole - where TUserClaim : IdentityUserClaim - where TRoleClaim : IdentityRoleClaim - { - - public IdentityDbContext() : base() - { - } - - public IdentityDbContext(DbCompiledModel model) - : base(model) - { - } - - public IdentityDbContext(string nameOrConnectionString) - : base(nameOrConnectionString) - { - } - - public IdentityDbContext(string nameOrConnectionString, DbCompiledModel model) - : base(nameOrConnectionString, model) - { - } - - public IdentityDbContext(DbConnection existingConnection, bool contextOwnsConnection) - : base(existingConnection, contextOwnsConnection) - { - } - - public IdentityDbContext(DbConnection existingConnection, DbCompiledModel model, bool contextOwnsConnection) - : base(existingConnection, model, contextOwnsConnection) - { - } - - protected override void OnModelCreating(DbModelBuilder modelBuilder) - { - base.OnModelCreating(modelBuilder); - - var userModel = modelBuilder.Entity(); - - userModel.Property(x => x.LockoutEndDateUtc).HasColumnName("LockoutEnd"); - userModel.Property(x => x.ConcurrencyStamp).IsConcurrencyToken(true); - - modelBuilder.Entity() - .HasKey(x => x.Id) - .Map(config => config.ToTable("AspNetRoleClaims")); - - modelBuilder.Entity().Property(x => x.ConcurrencyStamp).IsConcurrencyToken(true); - } - - protected override DbEntityValidationResult ValidateEntity(DbEntityEntry entityEntry, IDictionary items) - { - if (entityEntry.Entity is TUser && entityEntry.State == EntityState.Modified) - { - entityEntry.Cast().Property(p => p.ConcurrencyStamp).CurrentValue = Guid.NewGuid().ToString(); - } - else if (entityEntry.Entity is TRole && entityEntry.State == EntityState.Modified) - { - entityEntry.Cast().Property(p => p.ConcurrencyStamp).CurrentValue = Guid.NewGuid().ToString(); - } - return base.ValidateEntity(entityEntry, items); - } - - public virtual IDbSet RoleClaims { get; set; } - } -} diff --git a/src/Identity/src/AspNetCoreCompat/IdentityRole.cs b/src/Identity/src/AspNetCoreCompat/IdentityRole.cs deleted file mode 100644 index c671706d92..0000000000 --- a/src/Identity/src/AspNetCoreCompat/IdentityRole.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) Microsoft Corporation, Inc. All rights reserved. -// Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.AspNet.Identity.EntityFramework; - -namespace Microsoft.AspNet.Identity.CoreCompat -{ - public class IdentityRole : IdentityRole - { - /// - /// Constructor - /// - public IdentityRole() - { - Id = Guid.NewGuid().ToString(); - } - - /// - /// Constructor - /// - /// - public IdentityRole(string roleName) - : this() - { - Name = roleName; - } - } - - public class IdentityRole : Microsoft.AspNet.Identity.EntityFramework.IdentityRole - where TUserRole : IdentityUserRole - { - /// - /// Normalized role name - /// - public virtual string NormalizedName { get; set; } - - /// - /// Concurrency stamp - /// - public virtual string ConcurrencyStamp { get; set; } = Guid.NewGuid().ToString(); - - /// - /// Navigation property for claims in the role - /// - public virtual ICollection> Claims { get; } = new List>(); - } -} - diff --git a/src/Identity/src/AspNetCoreCompat/IdentityRoleClaim.cs b/src/Identity/src/AspNetCoreCompat/IdentityRoleClaim.cs deleted file mode 100644 index c6b10687b4..0000000000 --- a/src/Identity/src/AspNetCoreCompat/IdentityRoleClaim.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) Microsoft Corporation, Inc. All rights reserved. -// Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNet.Identity.CoreCompat -{ - public class IdentityRoleClaim : IdentityRoleClaim { } - - /// - /// EntityType that represents one specific role claim - /// - /// - public class IdentityRoleClaim - { - /// - /// Primary key - /// - public virtual int Id { get; set; } - - /// - /// User Id for the role this claim belongs to - /// - public virtual TKey RoleId { get; set; } - - /// - /// Claim type - /// - public virtual string ClaimType { get; set; } - - /// - /// Claim value - /// - public virtual string ClaimValue { get; set; } - } -} - diff --git a/src/Identity/src/AspNetCoreCompat/IdentityUser.cs b/src/Identity/src/AspNetCoreCompat/IdentityUser.cs deleted file mode 100644 index e9df36348b..0000000000 --- a/src/Identity/src/AspNetCoreCompat/IdentityUser.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) Microsoft Corporation, Inc. All rights reserved. -// Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNet.Identity.EntityFramework; - -namespace Microsoft.AspNet.Identity.CoreCompat -{ - public class IdentityUser : IdentityUser - { - /// - /// Constructor which creates a new Guid for the Id - /// - public IdentityUser() - { - Id = Guid.NewGuid().ToString(); - } - - /// - /// Constructor that takes a userName - /// - /// - public IdentityUser(string userName) - : this() - { - UserName = userName; - NormalizedUserName = userName.ToUpperInvariant(); - } - } - - public class IdentityUser - : Microsoft.AspNet.Identity.EntityFramework.IdentityUser - where TUserLogin : IdentityUserLogin - where TUserRole : IdentityUserRole - where TUserClaim : IdentityUserClaim - { - public string NormalizedUserName { - get - { - return UserName.ToUpperInvariant(); - } - set { } - } - - /// - /// Normalized email - /// - public string NormalizedEmail { - get - { - return Email.ToUpperInvariant(); - } - set { } - } - - /// - /// Concurrency stamp - /// - public virtual string ConcurrencyStamp { get; set; } = Guid.NewGuid().ToString(); - } -} - diff --git a/src/Identity/src/AspNetCoreCompat/IdentityUserLogin.cs b/src/Identity/src/AspNetCoreCompat/IdentityUserLogin.cs deleted file mode 100644 index 5d36abb580..0000000000 --- a/src/Identity/src/AspNetCoreCompat/IdentityUserLogin.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNet.Identity.CoreCompat -{ - public class IdentityUserLogin : IdentityUserLogin { } - - /// - /// Represents a login and its associated provider for a user. - /// - /// The type of the primary key of the user associated with this login. - public class IdentityUserLogin : EntityFramework.IdentityUserLogin - { - /// - /// Gets or sets the friendly name used in a UI for this login. - /// - public virtual string ProviderDisplayName { get; set; } - } -} \ No newline at end of file diff --git a/src/Identity/src/AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj b/src/Identity/src/AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj deleted file mode 100644 index 4910d07d2a..0000000000 --- a/src/Identity/src/AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - A compatibility layer for sharing identity databases between Microsoft.AspNet.Identity.EntityFramework and Microsoft.AspNetCore.Identity.EntityFrameworkCore. - $(ExperimentalVersionPrefix) - $(ExperimentalVersionSuffix) - false - $(ExperimentalPackageVersion) - net461 - $(NoWarn);CS1591 - true - aspnetcore;identity;membership - - - - - - - - - diff --git a/src/Identity/src/AspNetCoreCompat/UserStore.cs b/src/Identity/src/AspNetCoreCompat/UserStore.cs deleted file mode 100644 index 1ecee58283..0000000000 --- a/src/Identity/src/AspNetCoreCompat/UserStore.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) Microsoft Corporation, Inc. All rights reserved. -// Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Data.Entity; -using Microsoft.AspNet.Identity.EntityFramework; - -namespace Microsoft.AspNet.Identity.CoreCompat -{ - public class UserStore : - UserStore, IUserStore - where TUser : IdentityUser - { - /// - /// Default constructor which uses a new instance of a default EntityDbContext. - /// - public UserStore() - : this(new IdentityDbContext()) - { - DisposeContext = true; - } - - /// - /// Constructor - /// - /// - public UserStore(DbContext context) - : base(context) - { - } - } - - public class UserStore - : EntityFramework.UserStore - where TKey : IEquatable - where TUser : IdentityUser - where TRole : IdentityRole - where TUserLogin : IdentityUserLogin, new() - where TUserRole : IdentityUserRole, new() - where TUserClaim : IdentityUserClaim, new() - { - /// - /// Constructor - /// - /// - public UserStore(DbContext context) : base(context) { } - - } -} - diff --git a/src/Identity/src/AspNetCoreCompat/baseline.netframework.json b/src/Identity/src/AspNetCoreCompat/baseline.netframework.json deleted file mode 100644 index caa12678eb..0000000000 --- a/src/Identity/src/AspNetCoreCompat/baseline.netframework.json +++ /dev/null @@ -1,887 +0,0 @@ -{ - "AssemblyIdentity": "Microsoft.AspNet.Identity.AspNetCoreCompat, Version=0.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityDbContext", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.CoreCompat.IdentityDbContext", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "model", - "Type": "System.Data.Entity.Infrastructure.DbCompiledModel" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "nameOrConnectionString", - "Type": "System.String" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "nameOrConnectionString", - "Type": "System.String" - }, - { - "Name": "model", - "Type": "System.Data.Entity.Infrastructure.DbCompiledModel" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "existingConnection", - "Type": "System.Data.Common.DbConnection" - }, - { - "Name": "contextOwnsConnection", - "Type": "System.Boolean" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "existingConnection", - "Type": "System.Data.Common.DbConnection" - }, - { - "Name": "model", - "Type": "System.Data.Entity.Infrastructure.DbCompiledModel" - }, - { - "Name": "contextOwnsConnection", - "Type": "System.Boolean" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [ - { - "ParameterName": "TUser", - "ParameterPosition": 0, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.CoreCompat.IdentityUser" - ] - } - ] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityDbContext", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.EntityFramework.IdentityDbContext", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "OnModelCreating", - "Parameters": [ - { - "Name": "modelBuilder", - "Type": "System.Data.Entity.DbModelBuilder" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Override": true, - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "ValidateEntity", - "Parameters": [ - { - "Name": "entityEntry", - "Type": "System.Data.Entity.Infrastructure.DbEntityEntry" - }, - { - "Name": "items", - "Type": "System.Collections.Generic.IDictionary" - } - ], - "ReturnType": "System.Data.Entity.Validation.DbEntityValidationResult", - "Virtual": true, - "Override": true, - "Visibility": "Protected", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_RoleClaims", - "Parameters": [], - "ReturnType": "System.Data.Entity.IDbSet", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_RoleClaims", - "Parameters": [ - { - "Name": "value", - "Type": "System.Data.Entity.IDbSet" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "model", - "Type": "System.Data.Entity.Infrastructure.DbCompiledModel" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "nameOrConnectionString", - "Type": "System.String" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "nameOrConnectionString", - "Type": "System.String" - }, - { - "Name": "model", - "Type": "System.Data.Entity.Infrastructure.DbCompiledModel" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "existingConnection", - "Type": "System.Data.Common.DbConnection" - }, - { - "Name": "contextOwnsConnection", - "Type": "System.Boolean" - } - ], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "existingConnection", - "Type": "System.Data.Common.DbConnection" - }, - { - "Name": "model", - "Type": "System.Data.Entity.Infrastructure.DbCompiledModel" - }, - { - "Name": "contextOwnsConnection", - "Type": "System.Boolean" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [ - { - "ParameterName": "TUser", - "ParameterPosition": 0, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.CoreCompat.IdentityUser" - ] - }, - { - "ParameterName": "TRole", - "ParameterPosition": 1, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.CoreCompat.IdentityRole" - ] - }, - { - "ParameterName": "TKey", - "ParameterPosition": 2, - "BaseTypeOrInterfaces": [] - }, - { - "ParameterName": "TUserLogin", - "ParameterPosition": 3, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin" - ] - }, - { - "ParameterName": "TUserRole", - "ParameterPosition": 4, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole" - ] - }, - { - "ParameterName": "TUserClaim", - "ParameterPosition": 5, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim" - ] - }, - { - "ParameterName": "TRoleClaim", - "ParameterPosition": 6, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.CoreCompat.IdentityRoleClaim" - ] - } - ] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityRole", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.CoreCompat.IdentityRole", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "roleName", - "Type": "System.String" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityRole", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.EntityFramework.IdentityRole", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_NormalizedName", - "Parameters": [], - "ReturnType": "System.String", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_NormalizedName", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_ConcurrencyStamp", - "Parameters": [], - "ReturnType": "System.String", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_ConcurrencyStamp", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_Claims", - "Parameters": [], - "ReturnType": "System.Collections.Generic.ICollection>", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [ - { - "ParameterName": "TKey", - "ParameterPosition": 0, - "BaseTypeOrInterfaces": [] - }, - { - "ParameterName": "TUserRole", - "ParameterPosition": 1, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole" - ] - } - ] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityRoleClaim", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.CoreCompat.IdentityRoleClaim", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityRoleClaim", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Id", - "Parameters": [], - "ReturnType": "System.Int32", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Id", - "Parameters": [ - { - "Name": "value", - "Type": "System.Int32" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_RoleId", - "Parameters": [], - "ReturnType": "T0", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_RoleId", - "Parameters": [ - { - "Name": "value", - "Type": "T0" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_ClaimType", - "Parameters": [], - "ReturnType": "System.String", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_ClaimType", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_ClaimValue", - "Parameters": [], - "ReturnType": "System.String", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_ClaimValue", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [ - { - "ParameterName": "TKey", - "ParameterPosition": 0, - "BaseTypeOrInterfaces": [] - } - ] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityUser", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.CoreCompat.IdentityUser", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "userName", - "Type": "System.String" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityUser", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.EntityFramework.IdentityUser", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_NormalizedUserName", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_NormalizedUserName", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_NormalizedEmail", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_NormalizedEmail", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_ConcurrencyStamp", - "Parameters": [], - "ReturnType": "System.String", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_ConcurrencyStamp", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [ - { - "ParameterName": "TKey", - "ParameterPosition": 0, - "BaseTypeOrInterfaces": [] - }, - { - "ParameterName": "TUserLogin", - "ParameterPosition": 1, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin" - ] - }, - { - "ParameterName": "TUserRole", - "ParameterPosition": 2, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole" - ] - }, - { - "ParameterName": "TUserClaim", - "ParameterPosition": 3, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim" - ] - } - ] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_ProviderDisplayName", - "Parameters": [], - "ReturnType": "System.String", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_ProviderDisplayName", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Virtual": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [ - { - "ParameterName": "TKey", - "ParameterPosition": 0, - "BaseTypeOrInterfaces": [] - } - ] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.UserStore", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.CoreCompat.UserStore", - "ImplementedInterfaces": [ - "Microsoft.AspNet.Identity.IUserStore" - ], - "Members": [ - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "context", - "Type": "System.Data.Entity.DbContext" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [ - { - "ParameterName": "TUser", - "ParameterPosition": 0, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.CoreCompat.IdentityUser" - ] - } - ] - }, - { - "Name": "Microsoft.AspNet.Identity.CoreCompat.UserStore", - "Visibility": "Public", - "Kind": "Class", - "BaseType": "Microsoft.AspNet.Identity.EntityFramework.UserStore", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "context", - "Type": "System.Data.Entity.DbContext" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [ - { - "ParameterName": "TUser", - "ParameterPosition": 0, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.CoreCompat.IdentityUser" - ] - }, - { - "ParameterName": "TRole", - "ParameterPosition": 1, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.CoreCompat.IdentityRole" - ] - }, - { - "ParameterName": "TKey", - "ParameterPosition": 2, - "BaseTypeOrInterfaces": [ - "System.IEquatable" - ] - }, - { - "ParameterName": "TUserLogin", - "ParameterPosition": 3, - "New": true, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin" - ] - }, - { - "ParameterName": "TUserRole", - "ParameterPosition": 4, - "New": true, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole" - ] - }, - { - "ParameterName": "TUserClaim", - "ParameterPosition": 5, - "New": true, - "BaseTypeOrInterfaces": [ - "Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim" - ] - } - ] - }, - { - "Name": "Owin.CookieInterop", - "Visibility": "Public", - "Kind": "Class", - "Abstract": true, - "Static": true, - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "CreateSharedDataFormat", - "Parameters": [ - { - "Name": "keyDirectory", - "Type": "System.IO.DirectoryInfo" - }, - { - "Name": "authenticationType", - "Type": "System.String" - } - ], - "ReturnType": "Microsoft.Owin.Security.ISecureDataFormat", - "Static": true, - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/src/Identity/src/Directory.Build.props b/src/Identity/src/Directory.Build.props deleted file mode 100644 index 4b89a431e7..0000000000 --- a/src/Identity/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj deleted file mode 100644 index 73155b6e2d..0000000000 --- a/src/Identity/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - Shared test suite for Asp.Net Identity Core store implementations. - netstandard2.0 - true - aspnetcore;identity;membership - true - false - - - - - - - - - - - - - - diff --git a/src/Identity/test/Directory.Build.props b/src/Identity/test/Directory.Build.props deleted file mode 100644 index 215a3aada7..0000000000 --- a/src/Identity/test/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - $(StandardTestTfms);netcoreapp2.0 - $(StandardTestTfms);net461 - - - - - - - - - - - - diff --git a/src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj deleted file mode 100644 index 178a2a1dda..0000000000 --- a/src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - - - diff --git a/src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj deleted file mode 100644 index bc8464f59b..0000000000 --- a/src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj deleted file mode 100644 index 0f5f5ec838..0000000000 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj deleted file mode 100644 index 903bcb51d1..0000000000 --- a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - - - diff --git a/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj deleted file mode 100644 index a10e779d7e..0000000000 --- a/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - - diff --git a/src/Identity/test/WebSites/Directory.Build.props b/src/Identity/test/WebSites/Directory.Build.props deleted file mode 100644 index 8db517176e..0000000000 --- a/src/Identity/test/WebSites/Directory.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - netcoreapp2.1 - $(DeveloperBuildTestWebsiteTfms) - $(StandardTestWebsiteTfms);netcoreapp2.0 - $(StandardTestWebsiteTfms);net461 - - diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj b/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj deleted file mode 100644 index ff9afd8729..0000000000 --- a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj +++ /dev/null @@ -1,48 +0,0 @@ - - - - $(StandardTestWebsiteTfms) - aspnet-Identity.DefaultUI.WebSite-80C658D8-CED7-467F-9B47-75DA3BC1A16D - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Properties/launchSettings.json b/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Properties/launchSettings.json deleted file mode 100644 index 9ceafce5ee..0000000000 --- a/src/Identity/test/WebSites/Identity.DefaultUI.WebSite/Properties/launchSettings.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:27891/", - "sslPort": 44333 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_HTTPS_PORT": "44333", - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "Identity.DefaultUI.WebSite": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_URLS": "https://localhost:44333;http://localhost:27891", - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/Identity/version.props b/src/Identity/version.props deleted file mode 100644 index fc671960f6..0000000000 --- a/src/Identity/version.props +++ /dev/null @@ -1,18 +0,0 @@ - - - 2.1.6 - servicing - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - 0.4.4 - servicing - $(ExperimentalVersionPrefix) - $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final - $(ExperimentalVersionSuffix)-$(BuildNumber) - - From 5a64688d8e192cacffda9440e8725c1ed41a30cf Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Tue, 25 Dec 2018 00:53:07 +0000 Subject: [PATCH 13/80] Make some ThrowHelpers static (#5951) --- src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs | 8 ++++---- .../Kestrel/Core/src/Internal/Http/HttpProtocol.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs index 6acb332a26..ceb017ad28 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs @@ -77,22 +77,22 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } } - protected void ThrowHeadersReadOnlyException() + protected static void ThrowHeadersReadOnlyException() { throw new InvalidOperationException(CoreStrings.HeadersAreReadOnly); } - protected void ThrowArgumentException() + protected static void ThrowArgumentException() { throw new ArgumentException(); } - protected void ThrowKeyNotFoundException() + protected static void ThrowKeyNotFoundException() { throw new KeyNotFoundException(); } - protected void ThrowDuplicateKeyException() + protected static void ThrowDuplicateKeyException() { throw new ArgumentException(CoreStrings.KeyAlreadyExists); } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs index 3309701e0a..72bedf1be6 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs @@ -1204,7 +1204,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http statusCode != StatusCodes.Status304NotModified; } - private void ThrowResponseAlreadyStartedException(string value) + private static void ThrowResponseAlreadyStartedException(string value) { throw new InvalidOperationException(CoreStrings.FormatParameterReadOnlyAfterResponseStarted(value)); } From 5a19fde1919a7041a44ed88ce486d4931b057787 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 26 Dec 2018 02:00:31 -0800 Subject: [PATCH 14/80] Skip failing test --- .../RazorPagesWithBasePathTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs index 1b833e2ce8..e25ccfec87 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs @@ -520,7 +520,7 @@ Hello from /Pages/Shared/"; Assert.Contains("Name is required", response); } - [Fact] + [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/6122")] public async Task PagesFromClassLibraries_CanBeServed() { // Act From b87ac1d65253ee5aea44c370e475542e056aa386 Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Wed, 26 Dec 2018 18:03:36 +0000 Subject: [PATCH 15/80] Use PopCount intrinsic (#5715) --- .../Core/src/Internal/Http/HttpHeaders.cs | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs index ceb017ad28..3df0869931 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs @@ -6,6 +6,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using System.Runtime.CompilerServices; +using System.Runtime.Intrinsics.X86; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.Extensions.Primitives; @@ -122,20 +123,29 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return StringValues.Concat(existing, append); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] protected static int BitCount(long value) { - // see https://github.com/dotnet/corefx/blob/5965fd3756bc9dd9c89a27621eb10c6931126de2/src/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/BitArithmetic.cs + int SoftwareFallback(ulong v) + { + // see https://github.com/dotnet/corefx/blob/5965fd3756bc9dd9c89a27621eb10c6931126de2/src/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/BitArithmetic.cs - const ulong Mask01010101 = 0x5555555555555555UL; - const ulong Mask00110011 = 0x3333333333333333UL; - const ulong Mask00001111 = 0x0F0F0F0F0F0F0F0FUL; - const ulong Mask00000001 = 0x0101010101010101UL; + const ulong Mask01010101 = 0x5555555555555555UL; + const ulong Mask00110011 = 0x3333333333333333UL; + const ulong Mask00001111 = 0x0F0F0F0F0F0F0F0FUL; + const ulong Mask00000001 = 0x0101010101010101UL; - var v = (ulong)value; + v = v - ((v >> 1) & Mask01010101); + v = (v & Mask00110011) + ((v >> 2) & Mask00110011); + return (int)(unchecked(((v + (v >> 4)) & Mask00001111) * Mask00000001) >> 56); + } - v = v - ((v >> 1) & Mask01010101); - v = (v & Mask00110011) + ((v >> 2) & Mask00110011); - return (int)(unchecked(((v + (v >> 4)) & Mask00001111) * Mask00000001) >> 56); + if (Popcnt.X64.IsSupported) + { + return (int)Popcnt.X64.PopCount((ulong)value); + } + + return SoftwareFallback((ulong)value); } protected virtual int GetCountFast() From 97386ac66fb52823afc3936465e603f2c2359718 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 26 Dec 2018 15:10:01 -0800 Subject: [PATCH 16/80] artifacts update --- build/artifacts.props | 1 - 1 file changed, 1 deletion(-) diff --git a/build/artifacts.props b/build/artifacts.props index 512c58b689..1ccbe04263 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -79,7 +79,6 @@ This can be done once #4246 is complete, and done in conjunction with converting - From 0e84cf5d285cb2d43a983cddb61b63c3353aa6e3 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 26 Dec 2018 15:13:19 -0800 Subject: [PATCH 17/80] Remove non-ignored files from 2.1 --- .../AspNetCore/Debug/aspnetcoremodule.res | Bin 1564 -> 0 bytes .../IIS/AspNetCoreModuleV1/AspNetCore/version.h | 13 ------------- 2 files changed, 13 deletions(-) delete mode 100644 src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Debug/aspnetcoremodule.res delete mode 100644 src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/version.h diff --git a/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Debug/aspnetcoremodule.res b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/Debug/aspnetcoremodule.res deleted file mode 100644 index ce13d95f24660820b5270d188f8f0777581ad20c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1564 zcmchXyKWOf6o!8j3zPuD5|k8MfPlt0iNPcVQA7waA{P;qmaM(LN%q?8+Og<(0GLGX3w14{PUlgl_ZamBnig$vb9h7Z$HFYa=M^%`tWG_-EdYZPd6U2?K6rT`G$(rQK%N#I_j!H=1@)baem`` zN-C?QHAY!AX7ODj_5nUU4dmnh5;Q)mhTCG7Om*`16*HRbA$`;iG1EP^@Qj^LhYUmf z`(&|Jr60n|CiVeY8(3|p2+7kfQlOE;S!A7J=n+5EI_rRHR>11hS6#1w_AVF#c3Z&~ zFxQ=Cm2X9N=oNGp*F>|7>=RRFy#}6jZpRGw5hx;%&G4FkktiGY*wOM8iM4iLmxwh! zhb}H8b2r13@6H&yGu9_(EP}90xAs_`VVTy$R%!MAg=t4uz;r;Kv=VhtWNW`k^$uWQkNf&;QlUR)mXW@eQepP* zz% Date: Wed, 26 Dec 2018 15:21:44 -0800 Subject: [PATCH 18/80] remove bad submodule --- modules/Scaffolding | 1 - 1 file changed, 1 deletion(-) delete mode 160000 modules/Scaffolding diff --git a/modules/Scaffolding b/modules/Scaffolding deleted file mode 160000 index 2f81b98c13..0000000000 --- a/modules/Scaffolding +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2f81b98c133c24ec699f370bf07b557dd484c646 From 0eab4640d2b1511e9c9ef47106f442c2ad8c816b Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 26 Dec 2018 15:34:24 -0800 Subject: [PATCH 19/80] Disable cert validation in Https tests (#6133) --- .../test/Common.FunctionalTests/HttpsTests.cs | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/Servers/IIS/test/Common.FunctionalTests/HttpsTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/HttpsTests.cs index 658aaf7a0b..c3003aaf4f 100644 --- a/src/Servers/IIS/test/Common.FunctionalTests/HttpsTests.cs +++ b/src/Servers/IIS/test/Common.FunctionalTests/HttpsTests.cs @@ -44,11 +44,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var handler = new HttpClientHandler - { - ServerCertificateCustomValidationCallback = (a, b, c, d) => true - }; - var client = deploymentResult.CreateClient(handler); + var client = CreateNonValidatingClient(deploymentResult); var response = await client.GetAsync("HttpsHelloWorld"); var responseText = await response.Content.ReadAsStringAsync(); if (variant.HostingModel == HostingModel.OutOfProcess) @@ -94,7 +90,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests }); var deploymentResult = await DeployAsync(deploymentParameters); - Assert.Equal(deploymentParameters.ApplicationBaseUriHint + appName, await deploymentResult.HttpClient.GetStringAsync($"/{appName}/ServerAddresses")); + var client = CreateNonValidatingClient(deploymentResult); + + Assert.Equal(deploymentParameters.ApplicationBaseUriHint + appName, await client.GetStringAsync($"/{appName}/ServerAddresses")); } [ConditionalFact] @@ -115,7 +113,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_HTTPS_PORT"] = "123"; var deploymentResult = await DeployAsync(deploymentParameters); - Assert.Equal("123", await deploymentResult.HttpClient.GetStringAsync("/HTTPS_PORT")); + var client = CreateNonValidatingClient(deploymentResult); + + Assert.Equal("123", await client.GetStringAsync("/HTTPS_PORT")); } [ConditionalFact] @@ -142,7 +142,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests }); var deploymentResult = await DeployAsync(deploymentParameters); - Assert.Equal("NOVALUE", await deploymentResult.HttpClient.GetStringAsync("/HTTPS_PORT")); + var client = CreateNonValidatingClient(deploymentResult); + + Assert.Equal("NOVALUE", await client.GetStringAsync("/HTTPS_PORT")); + } + + private static HttpClient CreateNonValidatingClient(IISDeploymentResult deploymentResult) + { + var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (a, b, c, d) => true + }; + return deploymentResult.CreateClient(handler); } public static int GetNextSSLPort(int avoid = 0) From 666f0dc0fdd3e455fb6a114c3062c2ece487706e Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 26 Dec 2018 15:52:33 -0800 Subject: [PATCH 20/80] Readd components --- build/buildorder.props | 1 + build/submodules.props | 1 + 2 files changed, 2 insertions(+) diff --git a/build/buildorder.props b/build/buildorder.props index ac5bcefe3a..02766b587b 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -13,6 +13,7 @@ + diff --git a/build/submodules.props b/build/submodules.props index 7cfec9408c..3a40bfd546 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -38,6 +38,7 @@ + From cb1917aa5990a701b92fc44f28f76b0718c76197 Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Thu, 27 Dec 2018 02:00:39 +0000 Subject: [PATCH 21/80] Don't allocate in BeginChunkBytes (#5688) --- .../Core/src/Internal/Http/ChunkWriter.cs | 74 ++++++++++--------- .../Core/src/Internal/Http/HttpProtocol.cs | 10 +-- .../Kestrel/Core/test/ChunkWriterTests.cs | 33 ++++++--- .../ChunkWriterBenchmark.cs | 63 ++++++++++++++++ ...pNetCore.Server.Kestrel.Performance.csproj | 1 + 5 files changed, 126 insertions(+), 55 deletions(-) create mode 100644 src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/ChunkWriter.cs b/src/Servers/Kestrel/Core/src/Internal/Http/ChunkWriter.cs index 3d8cc4566b..7bb2a3781f 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/ChunkWriter.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/ChunkWriter.cs @@ -5,59 +5,63 @@ using System; using System.Buffers; using System.IO.Pipelines; using System.Text; +using System.Runtime.CompilerServices; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { internal static class ChunkWriter { - private static readonly ArraySegment _endChunkBytes = CreateAsciiByteArraySegment("\r\n"); private static readonly byte[] _hex = Encoding.ASCII.GetBytes("0123456789abcdef"); - private static ArraySegment CreateAsciiByteArraySegment(string text) + public static int BeginChunkBytes(int dataCount, Span span) { - var bytes = Encoding.ASCII.GetBytes(text); - return new ArraySegment(bytes); - } - - public static ArraySegment BeginChunkBytes(int dataCount) - { - var bytes = new byte[10] - { - _hex[((dataCount >> 0x1c) & 0x0f)], - _hex[((dataCount >> 0x18) & 0x0f)], - _hex[((dataCount >> 0x14) & 0x0f)], - _hex[((dataCount >> 0x10) & 0x0f)], - _hex[((dataCount >> 0x0c) & 0x0f)], - _hex[((dataCount >> 0x08) & 0x0f)], - _hex[((dataCount >> 0x04) & 0x0f)], - _hex[((dataCount >> 0x00) & 0x0f)], - (byte)'\r', - (byte)'\n', - }; - // Determine the most-significant non-zero nibble int total, shift; - total = (dataCount > 0xffff) ? 0x10 : 0x00; - dataCount >>= total; - shift = (dataCount > 0x00ff) ? 0x08 : 0x00; - dataCount >>= shift; + var count = dataCount; + total = (count > 0xffff) ? 0x10 : 0x00; + count >>= total; + shift = (count > 0x00ff) ? 0x08 : 0x00; + count >>= shift; total |= shift; - total |= (dataCount > 0x000f) ? 0x04 : 0x00; + total |= (count > 0x000f) ? 0x04 : 0x00; - var offset = 7 - (total >> 2); - return new ArraySegment(bytes, offset, 10 - offset); + count = (total >> 2) + 3; + + var offset = 0; + ref var startHex = ref _hex[0]; + + for (shift = total; shift >= 0; shift -= 4) + { + // Using Unsafe.Add to elide the bounds check on _hex as the & 0x0f definately + // constrains it to the range 0x0 - 0xf, matching the bounds of the array + span[offset] = Unsafe.Add(ref startHex, ((dataCount >> shift) & 0x0f)); + offset++; + } + + span[count - 2] = (byte)'\r'; + span[count - 1] = (byte)'\n'; + + return count; } - internal static int WriteBeginChunkBytes(ref BufferWriter start, int dataCount) + internal static void WriteBeginChunkBytes(this ref BufferWriter start, int dataCount) { - var chunkSegment = BeginChunkBytes(dataCount); - start.Write(new ReadOnlySpan(chunkSegment.Array, chunkSegment.Offset, chunkSegment.Count)); - return chunkSegment.Count; + // 10 bytes is max length + \r\n + start.Ensure(10); + + var count = BeginChunkBytes(dataCount, start.Span); + start.Advance(count); } - internal static void WriteEndChunkBytes(ref BufferWriter start) + internal static void WriteEndChunkBytes(this ref BufferWriter start) { - start.Write(new ReadOnlySpan(_endChunkBytes.Array, _endChunkBytes.Offset, _endChunkBytes.Count)); + start.Ensure(2); + var span = start.Span; + + // CRLF done in reverse order so the 1st index will elide the bounds check for the 0th index + span[1] = (byte)'\n'; + span[0] = (byte)'\r'; + start.Advance(2); } } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs index 72bedf1be6..773e5cc112 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs @@ -927,9 +927,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { var writer = new BufferWriter(writableBuffer); - ChunkWriter.WriteBeginChunkBytes(ref writer, buffer.Length); + writer.WriteBeginChunkBytes(buffer.Length); writer.Write(buffer.Span); - ChunkWriter.WriteEndChunkBytes(ref writer); + writer.WriteEndChunkBytes(); writer.Commit(); bytesWritten = writer.BytesCommitted; @@ -938,12 +938,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return bytesWritten; } - private static ArraySegment CreateAsciiByteArraySegment(string text) - { - var bytes = Encoding.ASCII.GetBytes(text); - return new ArraySegment(bytes); - } - public void ProduceContinue() { if (HasResponseStarted) diff --git a/src/Servers/Kestrel/Core/test/ChunkWriterTests.cs b/src/Servers/Kestrel/Core/test/ChunkWriterTests.cs index 722c0281ab..2b6f3a3c65 100644 --- a/src/Servers/Kestrel/Core/test/ChunkWriterTests.cs +++ b/src/Servers/Kestrel/Core/test/ChunkWriterTests.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Linq; +using System; using System.Text; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Xunit; @@ -11,28 +11,37 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests public class ChunkWriterTests { [Theory] - [InlineData(1, "1\r\n")] - [InlineData(10, "a\r\n")] + [InlineData(0x00, "0\r\n")] + [InlineData(0x01, "1\r\n")] [InlineData(0x08, "8\r\n")] - [InlineData(0x10, "10\r\n")] + [InlineData(0x0a, "a\r\n")] + [InlineData(0x0f, "f\r\n")] + [InlineData(0x010, "10\r\n")] [InlineData(0x080, "80\r\n")] - [InlineData(0x100, "100\r\n")] + [InlineData(0x0ff, "ff\r\n")] + [InlineData(0x0100, "100\r\n")] [InlineData(0x0800, "800\r\n")] - [InlineData(0x1000, "1000\r\n")] + [InlineData(0x0fff, "fff\r\n")] + [InlineData(0x01000, "1000\r\n")] [InlineData(0x08000, "8000\r\n")] - [InlineData(0x10000, "10000\r\n")] + [InlineData(0x0ffff, "ffff\r\n")] + [InlineData(0x010000, "10000\r\n")] [InlineData(0x080000, "80000\r\n")] - [InlineData(0x100000, "100000\r\n")] + [InlineData(0x0fffff, "fffff\r\n")] + [InlineData(0x0100000, "100000\r\n")] [InlineData(0x0800000, "800000\r\n")] - [InlineData(0x1000000, "1000000\r\n")] + [InlineData(0x0ffffff, "ffffff\r\n")] + [InlineData(0x01000000, "1000000\r\n")] [InlineData(0x08000000, "8000000\r\n")] - [InlineData(0x10000000, "10000000\r\n")] + [InlineData(0x0fffffff, "fffffff\r\n")] + [InlineData(0x010000000, "10000000\r\n")] [InlineData(0x7fffffffL, "7fffffff\r\n")] public void ChunkedPrefixMustBeHexCrLfWithoutLeadingZeros(int dataCount, string expected) { - var beginChunkBytes = ChunkWriter.BeginChunkBytes(dataCount); + Span span = new byte[10]; + var count = ChunkWriter.BeginChunkBytes(dataCount, span); - Assert.Equal(Encoding.ASCII.GetBytes(expected), beginChunkBytes.ToArray()); + Assert.Equal(Encoding.ASCII.GetBytes(expected), span.Slice(0, count).ToArray()); } } } diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs new file mode 100644 index 0000000000..3b24e49cab --- /dev/null +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs @@ -0,0 +1,63 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Buffers; +using System.IO.Pipelines; +using System.Threading.Tasks; +using BenchmarkDotNet.Attributes; +using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; + +namespace Microsoft.AspNetCore.Server.Kestrel.Performance +{ + public class ChunkWriterBenchmark + { + private const int InnerLoopCount = 1024; + + private PipeReader _reader; + private PipeWriter _writer; + private MemoryPool _memoryPool; + + [GlobalSetup] + public void Setup() + { + _memoryPool = KestrelMemoryPool.Create(); + var pipe = new Pipe(new PipeOptions(_memoryPool)); + _reader = pipe.Reader; + _writer = pipe.Writer; + } + + [Params(0x0, 0x1, 0x10, 0x100, 0x1_000, 0x10_000, 0x100_000, 0x1_000_000)] + public int DataLength { get; set; } + + [Benchmark(OperationsPerInvoke = InnerLoopCount)] + public async Task WriteBeginChunkBytes() + { + WriteBeginChunkBytes_Write(); + + var flushResult = _writer.FlushAsync(); + + var result = await _reader.ReadAsync(); + _reader.AdvanceTo(result.Buffer.End, result.Buffer.End); + await flushResult; + } + + private void WriteBeginChunkBytes_Write() + { + var writer = new BufferWriter(_writer); + var dataLength = DataLength; + for (int i = 0; i < InnerLoopCount; i++) + { + ChunkWriter.WriteBeginChunkBytes(ref writer, dataLength); + } + + writer.Commit(); + } + + [GlobalCleanup] + public void Cleanup() + { + _memoryPool.Dispose(); + } + } +} diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj index 09655f7ca8..0015869a26 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj @@ -6,6 +6,7 @@ true true false + false From 8be8e0008dec5af5b73888b48d65d5bfc19cdf62 Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Thu, 27 Dec 2018 17:07:44 +0000 Subject: [PATCH 22/80] Avoid boxing context.Method (#5687) --- .../Core/src/Internal/Http/Http1MessageBody.cs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1MessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1MessageBody.cs index 15fb2dcb8f..eaed7c7be1 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1MessageBody.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1MessageBody.cs @@ -280,16 +280,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return new ForContentLength(keepAlive, contentLength, context); } - // Avoid slowing down most common case - if (!object.ReferenceEquals(context.Method, HttpMethods.Get)) + // If we got here, request contains no Content-Length or Transfer-Encoding header. + // Reject with 411 Length Required. + if (context.Method == HttpMethod.Post || context.Method == HttpMethod.Put) { - // If we got here, request contains no Content-Length or Transfer-Encoding header. - // Reject with 411 Length Required. - if (context.Method == HttpMethod.Post || context.Method == HttpMethod.Put) - { - var requestRejectionReason = httpVersion == HttpVersion.Http11 ? RequestRejectionReason.LengthRequired : RequestRejectionReason.LengthRequiredHttp10; - BadHttpRequestException.Throw(requestRejectionReason, context.Method); - } + var requestRejectionReason = httpVersion == HttpVersion.Http11 ? RequestRejectionReason.LengthRequired : RequestRejectionReason.LengthRequiredHttp10; + BadHttpRequestException.Throw(requestRejectionReason, context.Method); } return keepAlive ? MessageBody.ZeroContentLengthKeepAlive : MessageBody.ZeroContentLengthClose; From 0d9de4991eaae9401d64cd2eafa42f6aebde33ae Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Thu, 27 Dec 2018 18:46:53 +0000 Subject: [PATCH 23/80] Transport.Sockets.IOQueue -> IThreadPoolWorkItem (#4601) --- .../Kestrel/Transport.Sockets/src/Internal/IOQueue.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/IOQueue.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/IOQueue.cs index 892e3927df..e0ae0f4dfd 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/IOQueue.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/IOQueue.cs @@ -8,10 +8,8 @@ using System.Threading; namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { - public class IOQueue : PipeScheduler + public class IOQueue : PipeScheduler, IThreadPoolWorkItem { - private static readonly WaitCallback _doWorkCallback = s => ((IOQueue)s).DoWork(); - private readonly object _workSync = new object(); private readonly ConcurrentQueue _workItems = new ConcurrentQueue(); private bool _doingWork; @@ -30,13 +28,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { if (!_doingWork) { - System.Threading.ThreadPool.UnsafeQueueUserWorkItem(_doWorkCallback, this); + System.Threading.ThreadPool.UnsafeQueueUserWorkItem(this, preferLocal: false); _doingWork = true; } } } - private void DoWork() + void IThreadPoolWorkItem.Execute() { while (true) { From 27f3bd468c0d3d88452f73359029c9917fd7223b Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Thu, 27 Dec 2018 17:13:19 -0800 Subject: [PATCH 24/80] Manual upgrade of Razor SDK This version contains support for components --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index e2d436a1d5..2f31984144 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -107,7 +107,7 @@ 3.0.0-preview.18604.3 - 3.0.0-preview.18621.2 + 3.0.0-preview.18623.1 From a25c7d95e353d572864ff8df88cf71c9bf021385 Mon Sep 17 00:00:00 2001 From: Kristian Hellang Date: Fri, 28 Dec 2018 19:01:34 +0100 Subject: [PATCH 25/80] Replace custom DateTimeFormatter with ToString("r") or TryFormat (#5695) --- src/Http/Headers/src/DateTimeFormatter.cs | 100 ---------------------- src/Http/Headers/src/HeaderUtilities.cs | 11 ++- 2 files changed, 10 insertions(+), 101 deletions(-) delete mode 100644 src/Http/Headers/src/DateTimeFormatter.cs diff --git a/src/Http/Headers/src/DateTimeFormatter.cs b/src/Http/Headers/src/DateTimeFormatter.cs deleted file mode 100644 index 06893155bd..0000000000 --- a/src/Http/Headers/src/DateTimeFormatter.cs +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Globalization; -using System.Runtime.CompilerServices; -using Microsoft.Extensions.Primitives; - -namespace Microsoft.Net.Http.Headers -{ - internal static class DateTimeFormatter - { - private static readonly DateTimeFormatInfo FormatInfo = CultureInfo.InvariantCulture.DateTimeFormat; - - private static readonly string[] MonthNames = FormatInfo.AbbreviatedMonthNames; - private static readonly string[] DayNames = FormatInfo.AbbreviatedDayNames; - - private static readonly int Rfc1123DateLength = "ddd, dd MMM yyyy HH:mm:ss GMT".Length; - private static readonly int QuotedRfc1123DateLength = Rfc1123DateLength + 2; - - // ASCII numbers are in the range 48 - 57. - private const int AsciiNumberOffset = 0x30; - - private const string Gmt = "GMT"; - private const char Comma = ','; - private const char Space = ' '; - private const char Colon = ':'; - private const char Quote = '"'; - - public static string ToRfc1123String(this DateTimeOffset dateTime) - { - return ToRfc1123String(dateTime, false); - } - - public static string ToRfc1123String(this DateTimeOffset dateTime, bool quoted) - { - var universal = dateTime.UtcDateTime; - - var length = quoted ? QuotedRfc1123DateLength : Rfc1123DateLength; - var target = new InplaceStringBuilder(length); - - if (quoted) - { - target.Append(Quote); - } - - target.Append(DayNames[(int)universal.DayOfWeek]); - target.Append(Comma); - target.Append(Space); - AppendNumber(ref target, universal.Day); - target.Append(Space); - target.Append(MonthNames[universal.Month - 1]); - target.Append(Space); - AppendYear(ref target, universal.Year); - target.Append(Space); - AppendTimeOfDay(ref target, universal.TimeOfDay); - target.Append(Space); - target.Append(Gmt); - - if (quoted) - { - target.Append(Quote); - } - - return target.ToString(); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static void AppendYear(ref InplaceStringBuilder target, int year) - { - target.Append(GetAsciiChar(year / 1000)); - target.Append(GetAsciiChar(year % 1000 / 100)); - target.Append(GetAsciiChar(year % 100 / 10)); - target.Append(GetAsciiChar(year % 10)); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static void AppendTimeOfDay(ref InplaceStringBuilder target, TimeSpan timeOfDay) - { - AppendNumber(ref target, timeOfDay.Hours); - target.Append(Colon); - AppendNumber(ref target, timeOfDay.Minutes); - target.Append(Colon); - AppendNumber(ref target, timeOfDay.Seconds); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static void AppendNumber(ref InplaceStringBuilder target, int number) - { - target.Append(GetAsciiChar(number / 10)); - target.Append(GetAsciiChar(number % 10)); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static char GetAsciiChar(int value) - { - return (char)(AsciiNumberOffset + value); - } - } -} diff --git a/src/Http/Headers/src/HeaderUtilities.cs b/src/Http/Headers/src/HeaderUtilities.cs index c45ca9cf43..937e3f7181 100644 --- a/src/Http/Headers/src/HeaderUtilities.cs +++ b/src/Http/Headers/src/HeaderUtilities.cs @@ -589,7 +589,16 @@ namespace Microsoft.Net.Http.Headers public static string FormatDate(DateTimeOffset dateTime, bool quoted) { - return dateTime.ToRfc1123String(quoted); + if (quoted) + { + return string.Create(31, dateTime, (span, dt) => + { + span[0] = span[30] = '"'; + dt.TryFormat(span.Slice(1), out _, "r"); + }); + } + + return dateTime.ToString("r"); } public static StringSegment RemoveQuotes(StringSegment input) From a7b783724efc6c83306951ed8d116e397d2d14ed Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 28 Dec 2018 15:48:20 -0800 Subject: [PATCH 26/80] Fix ANCM environment variables bugs (#6083) --- .azure/pipelines/ci.yml | 2 +- .../CommonLib/ConfigurationSection.cpp | 12 + .../CommonLib/ConfigurationSection.h | 3 + .../CommonLib/StringHelpers.cpp | 9 +- .../CommonLib/StringHelpers.h | 9 + .../AspNetCoreModuleV2/CommonLib/exceptions.h | 11 + .../InProcessOptions.cpp | 2 +- .../InProcessOptions.h | 5 +- .../inprocessapplication.cpp | 35 +- .../serverprocess.cpp | 42 +- .../serverprocess.h | 5 +- .../environmentvariablehash.h | 9 +- .../environmentvariablehelpers.h | 409 ++---------------- .../requesthandler_config.cpp | 112 +---- .../RequestHandlerLib/requesthandler_config.h | 5 +- .../Inprocess/EnvironmentVariableTests.cs | 128 +++++- .../Utilities/FunctionalTestsBase.cs | 6 + .../testassets/InProcessWebSite/Startup.cs | 23 - .../testassets/InProcessWebSite/web.config | 6 - .../shared/SharedStartup/Startup.shared.cs | 5 + 20 files changed, 246 insertions(+), 592 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 11b06b530b..cb73aafae5 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -37,7 +37,7 @@ jobs: - template: jobs/iisintegration-job.yml parameters: TestGroupName: IISExpress - skipArgs: "/p:SkipIISBackwardsCompatibilityTests=false /p:SkipIISTests=true /p:SkipIISExpressTests=false /p:SkipIISForwardsCompatibilityTests=true" + skipArgs: "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=false /p:SkipIISForwardsCompatibilityTests=true" - template: jobs/iisintegration-job.yml parameters: TestGroupName: IISForwardCompat diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp index 3d05424490..5850a479b4 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp @@ -5,6 +5,7 @@ #include "StringHelpers.h" #include "ConfigurationLoadException.h" +#include std::wstring ConfigurationSection::GetRequiredString(const std::wstring& name) const { @@ -63,6 +64,17 @@ std::vector> ConfigurationSection::GetKeyV return pairs; } +std::map ConfigurationSection::GetMap(const std::wstring& name) const +{ + std::map pairs; + + for (auto const element : GetRequiredSection(name)->GetCollection()) + { + pairs.insert_or_assign(element->GetRequiredString(CS_ASPNETCORE_COLLECTION_ITEM_NAME), element->GetString(CS_ASPNETCORE_COLLECTION_ITEM_VALUE).value_or(L"")); + } + return pairs; +} + std::shared_ptr ConfigurationSection::GetRequiredSection(const std::wstring& name) const { auto section = GetSection(name); diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h index 6ca4e475e3..a3a1f52398 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h @@ -6,8 +6,10 @@ #include #include #include +#include #include "NonCopyable.h" +#include "StringHelpers.h" #define CS_ASPNETCORE_COLLECTION_ITEM_NAME L"name" #define CS_ASPNETCORE_COLLECTION_ITEM_VALUE L"value" @@ -46,6 +48,7 @@ public: DWORD GetRequiredTimespan(const std::wstring& name) const; virtual std::vector> GetKeyValuePairs(const std::wstring& name) const; + virtual std::map GetMap(const std::wstring& name) const; virtual std::shared_ptr GetRequiredSection(const std::wstring & name) const; diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp index 736597b9a5..c6ffbbf171 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp @@ -17,13 +17,18 @@ bool ends_with(const std::wstring &source, const std::wstring &suffix, bool igno bool equals_ignore_case(const std::wstring& s1, const std::wstring& s2) { - return CSTR_EQUAL == CompareStringOrdinal(s1.c_str(), static_cast(s1.length()), s2.c_str(), static_cast(s2.length()), true); + return compare_ignore_case(s1, s2) == 0; +} + +int compare_ignore_case(const std::wstring& s1, const std::wstring& s2) +{ + return CompareStringOrdinal(s1.c_str(), static_cast(s1.length()), s2.c_str(), static_cast(s2.length()), true) - CSTR_EQUAL; } std::wstring to_wide_string(const std::string &source, const unsigned int codePage) { // MultiByteToWideChar returns 0 on failure, which is also the same return value - // for empty strings. Preemptive return. + // for empty strings. Preemptive return. if (source.length() == 0) { return L""; diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h index 3adc8863a4..5fa59fee55 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h @@ -11,6 +11,9 @@ bool ends_with(const std::wstring &source, const std::wstring &suffix, bool igno [[nodiscard]] bool equals_ignore_case(const std::wstring& s1, const std::wstring& s2); +[[nodiscard]] +int compare_ignore_case(const std::wstring& s1, const std::wstring& s2); + [[nodiscard]] std::wstring to_wide_string(const std::string &source, const unsigned int codePage); @@ -48,3 +51,9 @@ std::string format(const std::string& format, Args ... args) return result; } +struct ignore_case_comparer +{ + bool operator() (const std::wstring & s1, const std::wstring & s2) const { + return compare_ignore_case(s1, s2) == -1; + } +}; diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/exceptions.h index 18115c0e48..5d2b59b463 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -134,6 +134,12 @@ private: return condition; } + __declspec(noinline) inline VOID ReportException(LOCATION_ARGUMENTS const InvalidOperationException& exception) +{ + TraceException(LOCATION_CALL exception); + DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "InvalidOperationException '%ls' caught at " LOCATION_FORMAT, exception.as_wstring().c_str(), LOCATION_CALL_ONLY); +} + __declspec(noinline) inline VOID ReportException(LOCATION_ARGUMENTS const std::exception& exception) { TraceException(LOCATION_CALL exception); @@ -165,6 +171,11 @@ __declspec(noinline) inline HRESULT CaughtExceptionHResult(LOCATION_ARGUMENTS_ON ReportException(LOCATION_CALL exception); return exception.GetResult(); } + catch (const InvalidOperationException& exception) + { + ReportException(LOCATION_CALL exception); + return HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION); + } catch (const std::exception& exception) { ReportException(LOCATION_CALL exception); diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp index 48e401b2b8..568939e84a 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp @@ -53,7 +53,7 @@ InProcessOptions::InProcessOptions(const ConfigurationSource &configurationSourc m_fStdoutLogEnabled = aspNetCoreSection->GetRequiredBool(CS_ASPNETCORE_STDOUT_LOG_ENABLED); m_struStdoutLogFile = aspNetCoreSection->GetRequiredString(CS_ASPNETCORE_STDOUT_LOG_FILE); m_fDisableStartUpErrorPage = aspNetCoreSection->GetRequiredBool(CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE); - m_environmentVariables = aspNetCoreSection->GetKeyValuePairs(CS_ASPNETCORE_ENVIRONMENT_VARIABLES); + m_environmentVariables = aspNetCoreSection->GetMap(CS_ASPNETCORE_ENVIRONMENT_VARIABLES); const auto handlerSettings = aspNetCoreSection->GetKeyValuePairs(CS_ASPNETCORE_HANDLER_SETTINGS); m_fSetCurrentDirectory = equals_ignore_case(find_element(handlerSettings, CS_ASPNETCORE_HANDLER_SET_CURRENT_DIRECTORY).value_or(L"true"), L"true"); diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h index 3068936eca..e1df82aedd 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h @@ -7,6 +7,7 @@ #include "BindingInformation.h" #include "ConfigurationSource.h" #include "WebConfigConfigurationSource.h" +#include class InProcessOptions: NonCopyable { @@ -87,7 +88,7 @@ public: return m_dwShutdownTimeLimitInMS; } - const std::vector>& + const std::map& QueryEnvironmentVariables() const { return m_environmentVariables; @@ -120,7 +121,7 @@ private: bool m_fAnonymousAuthEnabled; DWORD m_dwStartupTimeLimitInMS; DWORD m_dwShutdownTimeLimitInMS; - std::vector> m_environmentVariables; + std::map m_environmentVariables; std::vector m_bindingInformation; protected: diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 4563965d73..227795918b 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -425,37 +425,20 @@ IN_PROCESS_APPLICATION::ClrThreadEntryPoint(const std::shared_ptrQueryEnvironmentVariables(); - - auto inputTable = std::unique_ptr(new ENVIRONMENT_VAR_HASH()); - RETURN_IF_FAILED(inputTable->Initialize(37 /*prime*/)); - // Copy environment variables to old style hash table - for (auto & variable : variables) - { - auto pNewEntry = std::unique_ptr(new ENVIRONMENT_VAR_ENTRY()); - RETURN_IF_FAILED(pNewEntry->Initialize((variable.first + L"=").c_str(), variable.second.c_str())); - RETURN_IF_FAILED(inputTable->InsertRecord(pNewEntry.get())); - } - - ENVIRONMENT_VAR_HASH* pHashTable = NULL; - std::unique_ptr table; - RETURN_IF_FAILED(ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable( - inputTable.get(), + auto variables = ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable( + m_pConfig->QueryEnvironmentVariables(), m_pConfig->QueryWindowsAuthEnabled(), m_pConfig->QueryBasicAuthEnabled(), m_pConfig->QueryAnonymousAuthEnabled(), + false, // fAddHostingStartup QueryApplicationPhysicalPath().c_str(), - nullptr, /* pHttpsPort */ - &pHashTable)); + nullptr); - table.reset(pHashTable); - - HRESULT hr = S_OK; - table->Apply(ENVIRONMENT_VAR_HELPERS::AppendEnvironmentVariables, &hr); - RETURN_IF_FAILED(hr); - - table->Apply(ENVIRONMENT_VAR_HELPERS::SetEnvironmentVariables, &hr); - RETURN_IF_FAILED(hr); + for (const auto & variable : variables) + { + LOG_INFOF(L"Setting environment variable %ls=%ls", variable.first.c_str(), variable.second.c_str()); + SetEnvironmentVariable(variable.first.c_str(), variable.second.c_str()); + } return S_OK; } diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp index 5446f97780..69b11cd15d 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp @@ -24,7 +24,7 @@ SERVER_PROCESS::Initialize( BOOL fWindowsAuthEnabled, BOOL fBasicAuthEnabled, BOOL fAnonymousAuthEnabled, - ENVIRONMENT_VAR_HASH *pEnvironmentVariables, + std::map& pEnvironmentVariables, BOOL fStdoutLogEnabled, BOOL fWebSocketSupported, STRU *pstruStdoutLogFile, @@ -761,6 +761,8 @@ SERVER_PROCESS::StartProcess( ENVIRONMENT_VAR_HASH *pHashTable = NULL; PWSTR pStrStage = NULL; BOOL fCriticalError = FALSE; + std::map variables; + GetStartupInfoW(&startupInfo); // @@ -782,27 +784,30 @@ SERVER_PROCESS::StartProcess( goto Failure; } - if (FAILED_LOG(hr = ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable( - m_pEnvironmentVarTable, - m_fWindowsAuthEnabled, - m_fBasicAuthEnabled, - m_fAnonymousAuthEnabled, - m_struAppFullPath.QueryStr(), - m_struHttpsPort.QueryStr(), - &pHashTable))) + try { - pStrStage = L"InitEnvironmentVariablesTable"; - goto Failure; + variables = ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable( + m_pEnvironmentVarTable, + m_fWindowsAuthEnabled, + m_fBasicAuthEnabled, + m_fAnonymousAuthEnabled, + true, // fAddHostingStartup + m_struAppFullPath.QueryStr(), + m_struHttpsPort.QueryStr()); + + variables = ENVIRONMENT_VAR_HELPERS::AddWebsocketEnabledToEnvironmentVariables(variables, m_fWebSocketSupported); } + CATCH_RETURN(); - if (FAILED_LOG(hr = ENVIRONMENT_VAR_HELPERS::AddWebsocketEnabledToEnvironmentVariables( - pHashTable, - m_fWebSocketSupported - ))) + + pHashTable = new ENVIRONMENT_VAR_HASH(); + RETURN_IF_FAILED(pHashTable->Initialize(37 /*prime*/)); + // Copy environment variables to old style hash table + for (auto & variable : variables) { - pStrStage = L"AddWebsocketEnabledToEnvironmentVariables"; - goto Failure; - + auto pNewEntry = std::unique_ptr(new ENVIRONMENT_VAR_ENTRY()); + RETURN_IF_FAILED(pNewEntry->Initialize((variable.first + L"=").c_str(), variable.second.c_str())); + RETURN_IF_FAILED(pHashTable->InsertRecord(pNewEntry.get())); } // @@ -1793,7 +1798,6 @@ SERVER_PROCESS::~SERVER_PROCESS() CleanUp(); - m_pEnvironmentVarTable = NULL; // no need to free m_pEnvironmentVarTable, as it references to // the same hash table hold by configuration. // the hashtable memory will be freed once onfiguration got recycled diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h index 028acd6e48..36d6b6ab72 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h @@ -4,6 +4,7 @@ #pragma once #include +#include #define MIN_PORT 1025 #define MAX_PORT 48000 @@ -33,7 +34,7 @@ public: _In_ BOOL fWindowsAuthEnabled, _In_ BOOL fBasicAuthEnabled, _In_ BOOL fAnonymousAuthEnabled, - _In_ ENVIRONMENT_VAR_HASH* pEnvironmentVariables, + _In_ std::map& pEnvironmentVariables, _In_ BOOL fStdoutLogEnabled, _In_ BOOL fWebSocketSupported, _In_ STRU *pstruStdoutLogFile, @@ -290,5 +291,5 @@ private: HANDLE m_hChildProcessWaitHandles[MAX_ACTIVE_CHILD_PROCESSES]; PROCESS_MANAGER *m_pProcessManager; - ENVIRONMENT_VAR_HASH *m_pEnvironmentVarTable ; + std::map m_pEnvironmentVarTable; }; diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h index be1276fd48..dfb72556c4 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h @@ -4,12 +4,11 @@ #pragma once #define HOSTING_STARTUP_ASSEMBLIES_ENV_STR L"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES" -#define HOSTING_STARTUP_ASSEMBLIES_NAME L"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES=" #define HOSTING_STARTUP_ASSEMBLIES_VALUE L"Microsoft.AspNetCore.Server.IISIntegration" -#define ASPNETCORE_IIS_AUTH_ENV_STR L"ASPNETCORE_IIS_HTTPAUTH=" -#define ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR L"ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED=" -#define ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR L"ASPNETCORE_IIS_PHYSICAL_PATH=" -#define ASPNETCORE_HTTPS_PORT_ENV_STR L"ASPNETCORE_HTTPS_PORT=" +#define ASPNETCORE_IIS_AUTH_ENV_STR L"ASPNETCORE_IIS_HTTPAUTH" +#define ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR L"ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED" +#define ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR L"ASPNETCORE_IIS_PHYSICAL_PATH" +#define ASPNETCORE_HTTPS_PORT_ENV_STR L"ASPNETCORE_HTTPS_PORT" #define ASPNETCORE_IIS_AUTH_WINDOWS L"windows;" #define ASPNETCORE_IIS_AUTH_BASIC L"basic;" #define ASPNETCORE_IIS_AUTH_ANONYMOUS L"anonymous;" diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h index f95feca6b9..c595fb3d80 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h @@ -2,6 +2,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #pragma once +#include +#include "Environment.h" class ENVIRONMENT_VAR_HELPERS { @@ -24,422 +26,77 @@ public: } static - VOID - CopyToTable( - ENVIRONMENT_VAR_ENTRY * pEntry, - PVOID pvData - ) - { - // best effort copy, ignore the failure - ENVIRONMENT_VAR_ENTRY * pNewEntry = new ENVIRONMENT_VAR_ENTRY(); - if (pNewEntry != NULL) - { - pNewEntry->Initialize(pEntry->QueryName(), pEntry->QueryValue()); - ENVIRONMENT_VAR_HASH *pHash = static_cast(pvData); - DBG_ASSERT(pHash); - pHash->InsertRecord(pNewEntry); - // Need to dereference as InsertRecord references it now - pNewEntry->Dereference(); - } - } - - static - VOID - AppendEnvironmentVariables - ( - ENVIRONMENT_VAR_ENTRY * pEntry, - PVOID pvData - ) - { - HRESULT hr = S_OK; - DWORD dwResult = 0; - DWORD dwError = 0; - STRU struNameBuffer; - STACK_STRU(struValueBuffer, 300); - BOOL fFound = FALSE; - - HRESULT* pHr = static_cast(pvData); - - // pEntry->QueryName includes the trailing =, remove it before calling stru - if (FAILED(hr = struNameBuffer.Copy(pEntry->QueryName()))) - { - goto Finished; - } - dwResult = struNameBuffer.LastIndexOf(L'='); - if (dwResult != -1) - { - struNameBuffer.QueryStr()[dwResult] = L'\0'; - if (FAILED(hr = struNameBuffer.SyncWithBuffer())) - { - goto Finished; - } - } - - dwResult = GetEnvironmentVariable(struNameBuffer.QueryStr(), struValueBuffer.QueryStr(), struValueBuffer.QuerySizeCCH()); - if (dwResult == 0) - { - dwError = GetLastError(); - // Windows API (e.g., CreateProcess) allows variable with empty string value - // in such case dwResult will be 0 and dwError will also be 0 - // As UI and CMD does not allow empty value, ignore this environment var - if (dwError != ERROR_ENVVAR_NOT_FOUND && dwError != ERROR_SUCCESS) - { - hr = HRESULT_FROM_WIN32(dwError); - goto Finished; - } - } - else if (dwResult > struValueBuffer.QuerySizeCCH()) - { - // have to increase the buffer and try get environment var again - struValueBuffer.Reset(); - struValueBuffer.Resize(dwResult + (DWORD)wcslen(pEntry->QueryValue()) + 2); // for null char and semicolon - dwResult = GetEnvironmentVariable(struNameBuffer.QueryStr(), - struValueBuffer.QueryStr(), - struValueBuffer.QuerySizeCCH()); - - if (dwResult <= 0) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - fFound = TRUE; - } - else - { - fFound = TRUE; - } - - if (FAILED(hr = struValueBuffer.SyncWithBuffer())) - { - goto Finished; - } - - if (fFound) - { - if (FAILED(hr = struValueBuffer.Append(L";"))) - { - goto Finished; - } - } - if (FAILED(hr = struValueBuffer.Append(pEntry->QueryValue()))) - { - goto Finished; - } - - if (FAILED(hr = pEntry->Initialize(pEntry->QueryName(), struValueBuffer.QueryStr()))) - { - goto Finished; - } - - Finished: - if (FAILED(hr)) - { - *pHr = hr; - } - return; - } - - static - VOID - SetEnvironmentVariables - ( - ENVIRONMENT_VAR_ENTRY * pEntry, - PVOID pvData - ) - { - UNREFERENCED_PARAMETER(pvData); - HRESULT hr = S_OK; - DWORD dwResult = 0; - STRU struNameBuffer; - - HRESULT* pHr = static_cast(pvData); - - // pEntry->QueryName includes the trailing =, remove it before calling SetEnvironmentVariable. - if (FAILED(hr = struNameBuffer.Copy(pEntry->QueryName()))) - { - goto Finished; - } - dwResult = struNameBuffer.LastIndexOf(L'='); - if (dwResult != -1) - { - struNameBuffer.QueryStr()[dwResult] = L'\0'; - if (FAILED(hr = struNameBuffer.SyncWithBuffer())) - { - goto Finished; - } - } - - dwResult = SetEnvironmentVariable(struNameBuffer.QueryStr(), pEntry->QueryValue()); - if (dwResult == 0) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - } - - Finished: - if (FAILED(hr)) - { - *pHr = hr; - } - return; - } - - static - HRESULT + std::map InitEnvironmentVariablesTable ( - _In_ ENVIRONMENT_VAR_HASH* pInEnvironmentVarTable, + _In_ const std::map& pInEnvironmentVarTable, _In_ BOOL fWindowsAuthEnabled, _In_ BOOL fBasicAuthEnabled, _In_ BOOL fAnonymousAuthEnabled, + _In_ BOOL fAddHostingStartup, _In_ PCWSTR pApplicationPhysicalPath, - _In_ PCWSTR pHttpsPort, - _Out_ ENVIRONMENT_VAR_HASH** ppEnvironmentVarTable + _In_ PCWSTR pHttpsPort ) { - HRESULT hr = S_OK; - BOOL fFound = FALSE; - DWORD dwResult, dwError; - STRU strIisAuthEnvValue; - STACK_STRU(strStartupAssemblyEnv, 1024); - ENVIRONMENT_VAR_ENTRY* pHostingEntry = NULL; - ENVIRONMENT_VAR_ENTRY* pIISAuthEntry = NULL; - ENVIRONMENT_VAR_ENTRY* pIISPathEntry = NULL; - ENVIRONMENT_VAR_ENTRY* pIISHttpsPort = NULL; - ENVIRONMENT_VAR_HASH* pEnvironmentVarTable = NULL; + std::map environmentVariables = pInEnvironmentVarTable; - pEnvironmentVarTable = new ENVIRONMENT_VAR_HASH(); - - // - // few environment variables expected, small bucket size for hash table - // - if (FAILED(hr = pEnvironmentVarTable->Initialize(37 /*prime*/))) + environmentVariables.insert_or_assign(ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR, pApplicationPhysicalPath); + if (pHttpsPort) { - goto Finished; - } - - // copy the envirable hash table (from configuration) to a temp one as we may need to remove elements - pInEnvironmentVarTable->Apply(ENVIRONMENT_VAR_HELPERS::CopyToTable, pEnvironmentVarTable); - if (pEnvironmentVarTable->Count() != pInEnvironmentVarTable->Count()) - { - // hash table copy failed - hr = E_UNEXPECTED; - goto Finished; - } - - pEnvironmentVarTable->FindKey((PWSTR)ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR, &pIISPathEntry); - if (pIISPathEntry != NULL) - { - // user defined ASPNETCORE_IIS_PHYSICAL_PATH in configuration, wipe it off - pIISPathEntry->Dereference(); - pEnvironmentVarTable->DeleteKey((PWSTR)ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR); - } - - pIISPathEntry = new ENVIRONMENT_VAR_ENTRY(); - - if (FAILED(hr = pIISPathEntry->Initialize(ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR, pApplicationPhysicalPath)) || - FAILED(hr = pEnvironmentVarTable->InsertRecord(pIISPathEntry))) - { - goto Finished; - } - - if (pHttpsPort != nullptr) - { - pEnvironmentVarTable->FindKey((PWSTR)ASPNETCORE_HTTPS_PORT_ENV_STR, &pIISHttpsPort); - if (pIISHttpsPort != NULL) - { - // user defined ASPNETCORE_HTTPS_PORT in configuration, don't override it - pIISHttpsPort->Dereference(); - } - else - { - pIISHttpsPort = new ENVIRONMENT_VAR_ENTRY(); - - if (FAILED(hr = pIISHttpsPort->Initialize(ASPNETCORE_HTTPS_PORT_ENV_STR, pHttpsPort)) || - FAILED(hr = pEnvironmentVarTable->InsertRecord(pIISHttpsPort))) - { - goto Finished; - } - } - } - - pEnvironmentVarTable->FindKey((PWSTR)ASPNETCORE_IIS_AUTH_ENV_STR, &pIISAuthEntry); - if (pIISAuthEntry != NULL) - { - // user defined ASPNETCORE_IIS_HTTPAUTH in configuration, wipe it off - pIISAuthEntry->Dereference(); - pEnvironmentVarTable->DeleteKey((PWSTR)ASPNETCORE_IIS_AUTH_ENV_STR); + environmentVariables.try_emplace(ASPNETCORE_HTTPS_PORT_ENV_STR, pHttpsPort); } + std::wstring strIisAuthEnvValue; if (fWindowsAuthEnabled) { - strIisAuthEnvValue.Copy(ASPNETCORE_IIS_AUTH_WINDOWS); + strIisAuthEnvValue.append(ASPNETCORE_IIS_AUTH_WINDOWS); } - if (fBasicAuthEnabled) { - strIisAuthEnvValue.Append(ASPNETCORE_IIS_AUTH_BASIC); + strIisAuthEnvValue.append(ASPNETCORE_IIS_AUTH_BASIC); } - if (fAnonymousAuthEnabled) { - strIisAuthEnvValue.Append(ASPNETCORE_IIS_AUTH_ANONYMOUS); + strIisAuthEnvValue.append(ASPNETCORE_IIS_AUTH_ANONYMOUS); + } + if (strIisAuthEnvValue.empty()) + { + strIisAuthEnvValue.append(ASPNETCORE_IIS_AUTH_NONE); } - if (strIisAuthEnvValue.IsEmpty()) - { - strIisAuthEnvValue.Copy(ASPNETCORE_IIS_AUTH_NONE); - } + environmentVariables.insert_or_assign(ASPNETCORE_IIS_AUTH_ENV_STR, strIisAuthEnvValue); - pIISAuthEntry = new ENVIRONMENT_VAR_ENTRY(); - - if (FAILED(hr = pIISAuthEntry->Initialize(ASPNETCORE_IIS_AUTH_ENV_STR, strIisAuthEnvValue.QueryStr())) || - FAILED(hr = pEnvironmentVarTable->InsertRecord(pIISAuthEntry))) + if (fAddHostingStartup && environmentVariables.count(HOSTING_STARTUP_ASSEMBLIES_ENV_STR) == 0) { - goto Finished; - } + auto hostingStartupValues = Environment::GetEnvironmentVariableValue(HOSTING_STARTUP_ASSEMBLIES_ENV_STR).value_or(L""); - // Compiler is complaining about conversion between PCWSTR and PWSTR here. - // Explictly casting. - pEnvironmentVarTable->FindKey((PWSTR)HOSTING_STARTUP_ASSEMBLIES_NAME, &pHostingEntry); - if (pHostingEntry != NULL) - { - // user defined ASPNETCORE_HOSTINGSTARTUPASSEMBLIES in configuration - // the value will be used in OutputEnvironmentVariables. Do nothing here - pHostingEntry->Dereference(); - pHostingEntry = NULL; - goto Skipped; - } - - //check whether ASPNETCORE_HOSTINGSTARTUPASSEMBLIES is defined in system - dwResult = GetEnvironmentVariable(HOSTING_STARTUP_ASSEMBLIES_ENV_STR, - strStartupAssemblyEnv.QueryStr(), - strStartupAssemblyEnv.QuerySizeCCH()); - if (dwResult == 0) - { - dwError = GetLastError(); - // Windows API (e.g., CreateProcess) allows variable with empty string value - // in such case dwResult will be 0 and dwError will also be 0 - // As UI and CMD does not allow empty value, ignore this environment var - if (dwError != ERROR_ENVVAR_NOT_FOUND && dwError != ERROR_SUCCESS) + if (hostingStartupValues.find(HOSTING_STARTUP_ASSEMBLIES_ENV_STR) == std::wstring::npos) { - hr = HRESULT_FROM_WIN32(dwError); - goto Finished; + hostingStartupValues += std::wstring(L";") + HOSTING_STARTUP_ASSEMBLIES_VALUE; } - } - else if (dwResult > strStartupAssemblyEnv.QuerySizeCCH()) - { - // have to increase the buffer and try get environment var again - strStartupAssemblyEnv.Reset(); - strStartupAssemblyEnv.Resize(dwResult + (DWORD)wcslen(HOSTING_STARTUP_ASSEMBLIES_VALUE) + 1); - dwResult = GetEnvironmentVariable(HOSTING_STARTUP_ASSEMBLIES_ENV_STR, - strStartupAssemblyEnv.QueryStr(), - strStartupAssemblyEnv.QuerySizeCCH()); - if (dwResult <= 0) - { - hr = E_UNEXPECTED; - goto Finished; - } - fFound = TRUE; - } - else - { - fFound = TRUE; + + environmentVariables.insert_or_assign(HOSTING_STARTUP_ASSEMBLIES_ENV_STR, hostingStartupValues); } - strStartupAssemblyEnv.SyncWithBuffer(); - if (strStartupAssemblyEnv.IndexOf(HOSTING_STARTUP_ASSEMBLIES_VALUE) == -1) + for (auto& environmentVariable : environmentVariables) { - if (fFound) - { - strStartupAssemblyEnv.Append(L";"); - } - strStartupAssemblyEnv.Append(HOSTING_STARTUP_ASSEMBLIES_VALUE); + environmentVariable.second = Environment::ExpandEnvironmentVariables(environmentVariable.second); } - // the environment variable was not defined, create it and add to hashtable - pHostingEntry = new ENVIRONMENT_VAR_ENTRY(); - - if (FAILED(hr = pHostingEntry->Initialize(HOSTING_STARTUP_ASSEMBLIES_NAME, strStartupAssemblyEnv.QueryStr())) || - FAILED(hr = pEnvironmentVarTable->InsertRecord(pHostingEntry))) - { - goto Finished; - } - - Skipped: - *ppEnvironmentVarTable = pEnvironmentVarTable; - pEnvironmentVarTable = NULL; - - Finished: - if (pHostingEntry != NULL) - { - pHostingEntry->Dereference(); - pHostingEntry = NULL; - } - - if (pIISAuthEntry != NULL) - { - pIISAuthEntry->Dereference(); - pIISAuthEntry = NULL; - } - - if (pEnvironmentVarTable != NULL) - { - pEnvironmentVarTable->Clear(); - delete pEnvironmentVarTable; - pEnvironmentVarTable = NULL; - } - return hr; + return environmentVariables; } static - HRESULT + std::map AddWebsocketEnabledToEnvironmentVariables ( - _Inout_ ENVIRONMENT_VAR_HASH* pInEnvironmentVarTable, + _Inout_ const std::map& pInEnvironmentVarTable, _In_ BOOL fWebsocketsEnabled ) { - HRESULT hr = S_OK; - ENVIRONMENT_VAR_ENTRY* pIISWebsocketEntry = NULL; - STACK_STRU(strIISWebsocketEnvValue, 40); - - // We only need to set the WEBSOCKET_SUPPORTED environment variable for out of process - pInEnvironmentVarTable->FindKey((PWSTR)ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR, &pIISWebsocketEntry); - if (pIISWebsocketEntry != NULL) - { - // user defined ASPNETCORE_IIS_WEBSOCKETS in configuration, wipe it off - pIISWebsocketEntry->Dereference(); - pInEnvironmentVarTable->DeleteKey((PWSTR)ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR); - } - // Set either true or false for the WebsocketEnvValue. - if (fWebsocketsEnabled) - { - if (FAILED(hr = strIISWebsocketEnvValue.Copy(L"true"))) - { - goto Finished; - } - } - else - { - if (FAILED(hr = strIISWebsocketEnvValue.Copy(L"false"))) - { - goto Finished; - } - } - - pIISWebsocketEntry = new ENVIRONMENT_VAR_ENTRY(); - - if (FAILED(hr = pIISWebsocketEntry->Initialize(ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR, strIISWebsocketEnvValue.QueryStr())) || - FAILED(hr = pInEnvironmentVarTable->InsertRecord(pIISWebsocketEntry))) - { - goto Finished; - } - - Finished: - return hr; + std::map environmentVariables = pInEnvironmentVarTable; + environmentVariables.insert_or_assign(ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR, fWebsocketsEnabled ? L"true" : L"false"); + return environmentVariables; } -public: - ENVIRONMENT_VAR_HELPERS(); - ~ENVIRONMENT_VAR_HELPERS(); }; diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp index 68abb1b8f1..f4507164df 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp @@ -15,13 +15,6 @@ REQUESTHANDLER_CONFIG::~REQUESTHANDLER_CONFIG() delete[] m_ppStrArguments; m_ppStrArguments = NULL; } - - if (m_pEnvironmentVariables != NULL) - { - m_pEnvironmentVariables->Clear(); - delete m_pEnvironmentVariables; - m_pEnvironmentVariables = NULL; - } } HRESULT @@ -100,12 +93,7 @@ REQUESTHANDLER_CONFIG::Populate( IAppHostElement *pWindowsAuthenticationElement = NULL; IAppHostElement *pBasicAuthenticationElement = NULL; IAppHostElement *pAnonymousAuthenticationElement = NULL; - IAppHostElement *pEnvVarList = NULL; - IAppHostElement *pEnvVar = NULL; - IAppHostElementCollection *pEnvVarCollection = NULL; ULONGLONG ullRawTimeSpan = 0; - ENUM_INDEX index; - ENVIRONMENT_VAR_ENTRY* pEntry = NULL; DWORD dwCounter = 0; DWORD dwPosition = 0; WCHAR* pszPath = NULL; @@ -114,26 +102,20 @@ REQUESTHANDLER_CONFIG::Populate( BSTR bstrAnonymousAuthSection = NULL; BSTR bstrAspNetCoreSection = NULL; - m_pEnvironmentVariables = new ENVIRONMENT_VAR_HASH(); - if (FAILED(hr = m_pEnvironmentVariables->Initialize(37 /*prime*/))) - { - delete m_pEnvironmentVariables; - m_pEnvironmentVariables = NULL; - goto Finished; - } - pAdminManager = pHttpServer->GetAdminManager(); - if (pSite != nullptr) + try { - try + WebConfigConfigurationSource source(pAdminManager, *pHttpApplication); + if (pSite != nullptr) { - WebConfigConfigurationSource source(pAdminManager, *pHttpApplication); m_struHttpsPort.Copy(BindingInformation::GetHttpsPort(BindingInformation::Load(source, *pSite)).c_str()); } - catch (...) - { - FINISHED_IF_FAILED(OBSERVE_CAUGHT_EXCEPTION()); - } + + m_pEnvironmentVariables = source.GetSection(CS_ASPNETCORE_SECTION)->GetMap(CS_ASPNETCORE_ENVIRONMENT_VARIABLES); + } + catch (...) + { + FINISHED_IF_FAILED(OBSERVE_CAUGHT_EXCEPTION()); } hr = m_struConfigPath.Copy(pHttpApplication->GetAppConfigPath()); @@ -397,58 +379,6 @@ REQUESTHANDLER_CONFIG::Populate( goto Finished; } - hr = GetElementChildByName(pAspNetCoreElement, - CS_ASPNETCORE_ENVIRONMENT_VARIABLES, - &pEnvVarList); - if (FAILED(hr)) - { - goto Finished; - } - - hr = pEnvVarList->get_Collection(&pEnvVarCollection); - if (FAILED(hr)) - { - goto Finished; - } - - for (hr = FindFirstElement(pEnvVarCollection, &index, &pEnvVar); - SUCCEEDED(hr); - hr = FindNextElement(pEnvVarCollection, &index, &pEnvVar)) - { - if (hr == S_FALSE) - { - hr = S_OK; - break; - } - - if (FAILED(hr = GetElementStringProperty(pEnvVar, - CS_ASPNETCORE_ENVIRONMENT_VARIABLE_NAME, - &strEnvName)) || - FAILED(hr = GetElementStringProperty(pEnvVar, - CS_ASPNETCORE_ENVIRONMENT_VARIABLE_VALUE, - &strEnvValue)) || - FAILED(hr = strEnvName.Append(L"=")) || - FAILED(hr = STRU::ExpandEnvironmentVariables(strEnvValue.QueryStr(), &strExpandedEnvValue))) - { - goto Finished; - } - - pEntry = new ENVIRONMENT_VAR_ENTRY(); - - if (FAILED(hr = pEntry->Initialize(strEnvName.QueryStr(), strExpandedEnvValue.QueryStr())) || - FAILED(hr = m_pEnvironmentVariables->InsertRecord(pEntry))) - { - goto Finished; - } - strEnvName.Reset(); - strEnvValue.Reset(); - strExpandedEnvValue.Reset(); - pEnvVar->Release(); - pEnvVar = NULL; - pEntry->Dereference(); - pEntry = NULL; - } - Finished: if (pAspNetCoreElement != NULL) @@ -475,29 +405,5 @@ Finished: pBasicAuthenticationElement = NULL; } - if (pEnvVarList != NULL) - { - pEnvVarList->Release(); - pEnvVarList = NULL; - } - - if (pEnvVar != NULL) - { - pEnvVar->Release(); - pEnvVar = NULL; - } - - if (pEnvVarCollection != NULL) - { - pEnvVarCollection->Release(); - pEnvVarCollection = NULL; - } - - if (pEntry != NULL) - { - pEntry->Dereference(); - pEntry = NULL; - } - return hr; } diff --git a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h index c757ab16c2..90a2b5a365 100644 --- a/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h +++ b/src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h @@ -68,7 +68,7 @@ public: _Out_ REQUESTHANDLER_CONFIG **ppAspNetCoreConfig ); - ENVIRONMENT_VAR_HASH* + std::map& QueryEnvironmentVariables( VOID ) @@ -225,7 +225,6 @@ protected: // REQUESTHANDLER_CONFIG() : m_fStdoutLogEnabled(FALSE), - m_pEnvironmentVariables(NULL), m_hostingModel(HOSTING_UNKNOWN), m_ppStrArguments(NULL) { @@ -257,7 +256,7 @@ protected: BOOL m_fBasicAuthEnabled; BOOL m_fAnonymousAuthEnabled; APP_HOSTING_MODEL m_hostingModel; - ENVIRONMENT_VAR_HASH* m_pEnvironmentVariables; + std::map m_pEnvironmentVariables; STRU m_struHostFxrLocation; PWSTR* m_ppStrArguments; DWORD m_dwArgc; diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs index ae8fde39ed..d044e49c91 100644 --- a/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs +++ b/src/Servers/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs @@ -2,50 +2,132 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - [Collection(IISTestSiteCollection.Name)] - public class EnvironmentVariableTests: FixtureLoggedTest - { - private readonly IISTestSiteFixture _fixture; + [Collection(PublishedSitesCollection.Name)] - public EnvironmentVariableTests(IISTestSiteFixture fixture): base(fixture) + public class EnvironmentVariableTests: IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public EnvironmentVariableTests(PublishedSitesFixture fixture) { _fixture = fixture; } - [ConditionalFact] - public async Task GetUniqueEnvironmentVariable() + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task GetLongEnvironmentVariable(HostingModel hostingModel) { - Assert.Equal("foobar", await _fixture.Client.GetStringAsync("/CheckEnvironmentVariable")); - } + var expectedValue = "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative"; + + + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_TESTING_LONG_VALUE"] = expectedValue; - [ConditionalFact] - public async Task GetLongEnvironmentVariable() - { Assert.Equal( - "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + - "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + - "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + - "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + - "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + - "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative", - await _fixture.Client.GetStringAsync("/CheckEnvironmentLongValueVariable")); + expectedValue, + await GetStringAsync(deploymentParameters, "/GetEnvironmentVariable?name=ASPNETCORE_INPROCESS_TESTING_LONG_VALUE")); } [ConditionalFact] - public async Task GetExistingEnvironmentVariable() + [RequiresNewHandler] + public Task AuthHeaderEnvironmentVariableRemoved_InProcess() => AuthHeaderEnvironmentVariableRemoved(HostingModel.InProcess); + + [ConditionalFact] + public Task AuthHeaderEnvironmentVariableRemoved_OutOfProcess() => AuthHeaderEnvironmentVariableRemoved(HostingModel.OutOfProcess); + + private async Task AuthHeaderEnvironmentVariableRemoved(HostingModel hostingModel) { - Assert.Contains(";foobarbaz", await _fixture.Client.GetStringAsync("/CheckAppendedEnvironmentVariable")); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_IIS_HTTPAUTH"] = "shouldberemoved"; + + Assert.DoesNotContain("shouldberemoved", await GetStringAsync(deploymentParameters,"/GetEnvironmentVariable?name=ASPNETCORE_IIS_HTTPAUTH")); } [ConditionalFact] - public async Task AuthHeaderEnvironmentVariableRemoved() + [RequiresNewHandler] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public Task WebConfigOverridesGlobalEnvironmentVariables_InProcess() => WebConfigOverridesGlobalEnvironmentVariables(HostingModel.InProcess); + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public Task WebConfigOverridesGlobalEnvironmentVariables_OutOfProcess() => WebConfigOverridesGlobalEnvironmentVariables(HostingModel.OutOfProcess); + + private async Task WebConfigOverridesGlobalEnvironmentVariables(HostingModel hostingModel) { - Assert.DoesNotContain("shouldberemoved", await _fixture.Client.GetStringAsync("/CheckRemoveAuthEnvironmentVariable")); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + deploymentParameters.EnvironmentVariables["ASPNETCORE_ENVIRONMENT"] = "Development"; + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_ENVIRONMENT"] = "Production"; + Assert.Equal("Production", await GetStringAsync(deploymentParameters, "/GetEnvironmentVariable?name=ASPNETCORE_ENVIRONMENT")); + } + + [ConditionalFact] + [RequiresNewHandler] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public Task WebConfigAppendsHostingStartup_InProcess() => WebConfigAppendsHostingStartup(HostingModel.InProcess); + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public Task WebConfigAppendsHostingStartup_OutOfProcess() => WebConfigAppendsHostingStartup(HostingModel.OutOfProcess); + + private async Task WebConfigAppendsHostingStartup(HostingModel hostingModel) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + deploymentParameters.EnvironmentVariables["ASPNETCORE_HOSTINGSTARTUPASSEMBLIES"] = "Asm1"; + if (hostingModel == HostingModel.InProcess) + { + Assert.Equal("Asm1", await GetStringAsync(deploymentParameters, "/GetEnvironmentVariable?name=ASPNETCORE_HOSTINGSTARTUPASSEMBLIES")); + } + else + { + Assert.Equal("Asm1;Microsoft.AspNetCore.Server.IISIntegration", await GetStringAsync(deploymentParameters, "/GetEnvironmentVariable?name=ASPNETCORE_HOSTINGSTARTUPASSEMBLIES")); + } + } + + [ConditionalFact] + [RequiresNewHandler] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public Task WebConfigOverridesHostingStartup_InProcess() => WebConfigOverridesHostingStartup(HostingModel.InProcess); + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public Task WebConfigOverridesHostingStartup_OutOfProcess() => WebConfigOverridesHostingStartup(HostingModel.OutOfProcess); + + private async Task WebConfigOverridesHostingStartup(HostingModel hostingModel) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + deploymentParameters.EnvironmentVariables["ASPNETCORE_HOSTINGSTARTUPASSEMBLIES"] = "Asm1"; + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_HOSTINGSTARTUPASSEMBLIES"] = "Asm2"; + Assert.Equal("Asm2", await GetStringAsync(deploymentParameters, "/GetEnvironmentVariable?name=ASPNETCORE_HOSTINGSTARTUPASSEMBLIES")); + } + + [ConditionalFact] + [RequiresNewHandler] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public Task WebConfigExpandsVariables_InProcess() => WebConfigExpandsVariables(HostingModel.InProcess); + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public Task WebConfigExpandsVariables_OutOfProcess() => WebConfigExpandsVariables(HostingModel.OutOfProcess); + + private async Task WebConfigExpandsVariables(HostingModel hostingModel) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + deploymentParameters.EnvironmentVariables["TestVariable"] = "World"; + deploymentParameters.WebConfigBasedEnvironmentVariables["OtherVariable"] = "%TestVariable%;Hello"; + Assert.Equal("World;Hello", await GetStringAsync(deploymentParameters, "/GetEnvironmentVariable?name=OtherVariable")); } } } diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index 1a1a4ce490..f57aa0ebec 100644 --- a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -45,6 +45,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting return result; } + protected virtual async Task GetStringAsync(IISDeploymentParameters parameters, string path) + { + var result = await DeployAsync(parameters); + return await result.HttpClient.GetStringAsync(path); + } + public override void Dispose() { StopServer(false); diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/Startup.cs b/src/Servers/IIS/test/testassets/InProcessWebSite/Startup.cs index eb84272b76..b156efa966 100644 --- a/src/Servers/IIS/test/testassets/InProcessWebSite/Startup.cs +++ b/src/Servers/IIS/test/testassets/InProcessWebSite/Startup.cs @@ -266,29 +266,6 @@ namespace TestSite } } - private async Task CheckEnvironmentVariable(HttpContext ctx) - { - var variable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_TESTING_VALUE"); - await ctx.Response.WriteAsync(variable); - } - - private async Task CheckEnvironmentLongValueVariable(HttpContext ctx) - { - var variable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_TESTING_LONG_VALUE"); - await ctx.Response.WriteAsync(variable); - } - - private async Task CheckAppendedEnvironmentVariable(HttpContext ctx) - { - var variable = Environment.GetEnvironmentVariable("ProgramFiles"); - await ctx.Response.WriteAsync(variable); - } - - private async Task CheckRemoveAuthEnvironmentVariable(HttpContext ctx) - { - var variable = Environment.GetEnvironmentVariable("ASPNETCORE_IIS_HTTPAUTH"); - await ctx.Response.WriteAsync(variable); - } private async Task ReadAndWriteSynchronously(HttpContext ctx) { var t2 = Task.Run(() => WriteManyTimesToResponseBody(ctx)); diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/web.config b/src/Servers/IIS/test/testassets/InProcessWebSite/web.config index 2a9bd223c3..352ab4021b 100644 --- a/src/Servers/IIS/test/testassets/InProcessWebSite/web.config +++ b/src/Servers/IIS/test/testassets/InProcessWebSite/web.config @@ -5,12 +5,6 @@ - - - - - - diff --git a/src/Servers/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs b/src/Servers/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs index f85f9e1fdd..513eb89cef 100644 --- a/src/Servers/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs +++ b/src/Servers/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs @@ -134,5 +134,10 @@ namespace TestSite GetDllDirectory(1024, builder); await context.Response.WriteAsync(builder.ToString()); } + + private async Task GetEnvironmentVariable(HttpContext ctx) + { + await ctx.Response.WriteAsync(Environment.GetEnvironmentVariable(ctx.Request.Query["name"].ToString())); + } } } From dd912850eb1a7bffcef819b99222b7dce173930c Mon Sep 17 00:00:00 2001 From: David Fowler Date: Fri, 28 Dec 2018 21:18:58 -0400 Subject: [PATCH 27/80] Reduce allocations (#6132) - Remove per request allocations by implementing IThreadPoolWorkItem on the IISHttpContext. - Removed per operation allocations by using UnsafeQueueUserWorkItem in AsyncIOOperation. - This should also reduce overhead by removing non-essential ExecutionContext propagation logic --- .../Core/IISHttpContext.cs | 37 +++++++++++- .../Core/IISHttpServer.cs | 59 ++++++------------- .../Core/IO/AsyncIOOperation.cs | 5 +- 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs index a0d28247f5..fbb421d07a 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs @@ -25,7 +25,7 @@ using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.IIS.Core { - internal abstract partial class IISHttpContext : NativeRequestContext, IDisposable + internal abstract partial class IISHttpContext : NativeRequestContext, IThreadPoolWorkItem, IDisposable { private const int MinAllocBufferSize = 2048; private const int PauseWriterThreshold = 65536; @@ -531,5 +531,40 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } return null; } + + // Invoked by the thread pool + public void Execute() + { + _ = HandleRequest(); + } + + private async Task HandleRequest() + { + bool successfulRequest = false; + try + { + successfulRequest = await ProcessRequestAsync(); + } + catch (Exception ex) + { + _logger.LogError(0, ex, $"Unexpected exception in {nameof(IISHttpContext)}.{nameof(HandleRequest)}."); + } + finally + { + // Post completion after completing the request to resume the state machine + PostCompletion(ConvertRequestCompletionResults(successfulRequest)); + + Server.DecrementRequests(); + + // Dispose the context + Dispose(); + } + } + + private static NativeMethods.REQUEST_NOTIFICATION_STATUS ConvertRequestCompletionResults(bool success) + { + return success ? NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_CONTINUE + : NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_FINISH_REQUEST; + } } } diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs index 70516418e6..3f35924398 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs @@ -152,6 +152,21 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _nativeApplication.Dispose(); } + private void IncrementRequests() + { + Interlocked.Increment(ref _outstandingRequests); + } + + internal void DecrementRequests() + { + if (Interlocked.Decrement(ref _outstandingRequests) == 0 && Stopping) + { + // All requests have been drained. + _nativeApplication.StopCallsIntoManaged(); + _shutdownSignal.TrySetResult(null); + } + } + private static NativeMethods.REQUEST_NOTIFICATION_STATUS HandleRequest(IntPtr pInProcessHandler, IntPtr pvRequestContext) { IISHttpServer server = null; @@ -159,11 +174,12 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { // Unwrap the server so we can create an http context and process the request server = (IISHttpServer)GCHandle.FromIntPtr(pvRequestContext).Target; - Interlocked.Increment(ref server._outstandingRequests); + server.IncrementRequests(); var context = server._iisContextFactory.CreateHttpContext(pInProcessHandler); - ThreadPool.QueueUserWorkItem(state => _ = HandleRequest((IISHttpContext)state), context); + ThreadPool.UnsafeQueueUserWorkItem(context, preferLocal: false); + return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_PENDING; } catch (Exception ex) @@ -174,23 +190,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } } - private static async Task HandleRequest(IISHttpContext context) - { - bool successfulRequest = false; - try - { - successfulRequest = await context.ProcessRequestAsync(); - } - catch (Exception ex) - { - context.Server._logger.LogError(0, ex, $"Unexpected exception in {nameof(IISHttpServer)}.{nameof(HandleRequest)}."); - } - finally - { - CompleteRequest(context, successfulRequest); - } - } - private static bool HandleShutdown(IntPtr pvRequestContext) { IISHttpServer server = null; @@ -238,28 +237,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } } - private static void CompleteRequest(IISHttpContext context, bool result) - { - // Post completion after completing the request to resume the state machine - context.PostCompletion(ConvertRequestCompletionResults(result)); - - if (Interlocked.Decrement(ref context.Server._outstandingRequests) == 0 && context.Server.Stopping) - { - // All requests have been drained. - context.Server._nativeApplication.StopCallsIntoManaged(); - context.Server._shutdownSignal.TrySetResult(null); - } - - // Dispose the context - context.Dispose(); - } - - private static NativeMethods.REQUEST_NOTIFICATION_STATUS ConvertRequestCompletionResults(bool success) - { - return success ? NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_CONTINUE - : NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_FINISH_REQUEST; - } - private class IISContextFactory : IISContextFactory { private readonly IHttpApplication _application; diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs index 80e9234ea2..0f8b533071 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs @@ -151,10 +151,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO { if (Continuation != null) { - // TODO: use generic overload when code moved to be netcoreapp only - var continuation = Continuation; - var state = State; - ThreadPool.QueueUserWorkItem(_ => continuation(state)); + ThreadPool.UnsafeQueueUserWorkItem(Continuation, State, preferLocal: false); } } } From b12c33dbc32a832d98e448f400db329690ef3b18 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sat, 29 Dec 2018 08:24:57 -0400 Subject: [PATCH 28/80] Replace ManualResetEvents with a TCS (#6173) * Added TaskCreationOptions.RunContinuationsAsynchronously in a few places --- .../Core/test/ConnectionDispatcherTests.cs | 3 +- .../Http2/Http2ConnectionTests.cs | 68 ++++++++++--------- .../DiagnosticMemoryPool.cs | 2 +- 3 files changed, 40 insertions(+), 33 deletions(-) diff --git a/src/Servers/Kestrel/Core/test/ConnectionDispatcherTests.cs b/src/Servers/Kestrel/Core/test/ConnectionDispatcherTests.cs index 8545a231a1..efc53c9228 100644 --- a/src/Servers/Kestrel/Core/test/ConnectionDispatcherTests.cs +++ b/src/Servers/Kestrel/Core/test/ConnectionDispatcherTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -21,6 +21,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests public void OnConnectionCreatesLogScopeWithConnectionId() { var serviceContext = new TestServiceContext(); + // This needs to run inline var tcs = new TaskCompletionSource(); var dispatcher = new ConnectionDispatcher(serviceContext, _ => tcs.Task); diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs index a6f32d0401..08236ac973 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs @@ -473,23 +473,26 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests [Fact] public async Task DATA_Received_Multiplexed_AppMustNotBlockOtherFrames() { - var stream1Read = new ManualResetEvent(false); - var stream1ReadFinished = new ManualResetEvent(false); - var stream3Read = new ManualResetEvent(false); - var stream3ReadFinished = new ManualResetEvent(false); + var stream1Read = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var stream1ReadFinished = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var stream3Read = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var stream3ReadFinished = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + await InitializeConnectionAsync(async context => { var data = new byte[10]; var read = await context.Request.Body.ReadAsync(new byte[10], 0, 10); if (context.Features.Get().StreamId == 1) { - stream1Read.Set(); - Assert.True(stream1ReadFinished.WaitOne(TimeSpan.FromSeconds(10))); + stream1Read.TrySetResult(null); + + await stream1ReadFinished.Task.DefaultTimeout(); } else { - stream3Read.Set(); - Assert.True(stream3ReadFinished.WaitOne(TimeSpan.FromSeconds(10))); + stream3Read.TrySetResult(null); + + await stream3ReadFinished.Task.DefaultTimeout(); } await context.Response.Body.WriteAsync(data, 0, read); }); @@ -498,12 +501,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await StartStreamAsync(3, _browserRequestHeaders, endStream: false); await SendDataAsync(1, _helloBytes, endStream: true); - Assert.True(stream1Read.WaitOne(TimeSpan.FromSeconds(10))); + await stream1Read.Task.DefaultTimeout(); await SendDataAsync(3, _helloBytes, endStream: true); - Assert.True(stream3Read.WaitOne(TimeSpan.FromSeconds(10))); + await stream3Read.Task.DefaultTimeout(); - stream3ReadFinished.Set(); + stream3ReadFinished.TrySetResult(null); await ExpectAsync(Http2FrameType.HEADERS, withLength: 37, @@ -518,7 +521,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests withFlags: (byte)Http2DataFrameFlags.END_STREAM, withStreamId: 3); - stream1ReadFinished.Set(); + stream1ReadFinished.TrySetResult(null); await ExpectAsync(Http2FrameType.HEADERS, withLength: 37, @@ -1197,33 +1200,36 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests [Fact] public async Task HEADERS_Received_AppCannotBlockOtherFrames() { - var firstRequestReceived = new ManualResetEvent(false); - var finishFirstRequest = new ManualResetEvent(false); - var secondRequestReceived = new ManualResetEvent(false); - var finishSecondRequest = new ManualResetEvent(false); - await InitializeConnectionAsync(context => + var firstRequestReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var finishFirstRequest = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var secondRequestReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var finishSecondRequest = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + await InitializeConnectionAsync(async context => { - if (!firstRequestReceived.WaitOne(0)) + if (!firstRequestReceived.Task.IsCompleted) { - firstRequestReceived.Set(); - Assert.True(finishFirstRequest.WaitOne(TimeSpan.FromSeconds(10))); + firstRequestReceived.TrySetResult(null); + + await finishFirstRequest.Task.DefaultTimeout(); } else { - secondRequestReceived.Set(); - Assert.True(finishSecondRequest.WaitOne(TimeSpan.FromSeconds(10))); - } + secondRequestReceived.TrySetResult(null); - return Task.CompletedTask; + await finishSecondRequest.Task.DefaultTimeout(); + } }); await StartStreamAsync(1, _browserRequestHeaders, endStream: true); - Assert.True(firstRequestReceived.WaitOne(TimeSpan.FromSeconds(10))); + + await firstRequestReceived.Task.DefaultTimeout(); await StartStreamAsync(3, _browserRequestHeaders, endStream: true); - Assert.True(secondRequestReceived.WaitOne(TimeSpan.FromSeconds(10))); - finishSecondRequest.Set(); + await secondRequestReceived.Task.DefaultTimeout(); + + finishSecondRequest.TrySetResult(null); await ExpectAsync(Http2FrameType.HEADERS, withLength: 55, @@ -1234,7 +1240,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests withFlags: (byte)Http2DataFrameFlags.END_STREAM, withStreamId: 3); - finishFirstRequest.Set(); + finishFirstRequest.TrySetResult(null); await ExpectAsync(Http2FrameType.HEADERS, withLength: 55, @@ -1255,7 +1261,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests _connection.ServerSettings.MaxConcurrentStreams = 1; - var requestBlocker = new TaskCompletionSource(); + var requestBlocker = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); await InitializeConnectionAsync(context => requestBlocker.Task); await StartStreamAsync(1, _browserRequestHeaders, endStream: true); @@ -1665,7 +1671,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { // > MaxRequestHeaderCount (100) var headers = new List>(); - headers.AddRange(new [] + headers.AddRange(new[] { new KeyValuePair(HeaderNames.Method, "GET"), new KeyValuePair(HeaderNames.Path, "/"), @@ -3863,7 +3869,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await SendDataAsync(1, new byte[100], endStream: true); // An extra one to break it await SendDataAsync(1, new byte[100], endStream: true); - + // There's a race where either of these messages could be logged, depending on if the stream cleanup has finished yet. await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, diff --git a/src/Shared/Buffers.MemoryPool/DiagnosticMemoryPool.cs b/src/Shared/Buffers.MemoryPool/DiagnosticMemoryPool.cs index d4d58e0241..4cbea8a866 100644 --- a/src/Shared/Buffers.MemoryPool/DiagnosticMemoryPool.cs +++ b/src/Shared/Buffers.MemoryPool/DiagnosticMemoryPool.cs @@ -40,7 +40,7 @@ namespace System.Buffers _rentTracking = rentTracking; _blocks = new HashSet(); _syncObj = new object(); - _allBlocksReturned = new TaskCompletionSource(); + _allBlocksReturned = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); _blockAccessExceptions = new List(); } From 010c1f0c9f22fba3f6a0e82461fa7553e9114b44 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sun, 30 Dec 2018 01:36:30 -0400 Subject: [PATCH 29/80] Call StopAsync before disposing (#6189) --- .../BadHttpRequestTests.cs | 6 + .../ChunkedRequestTests.cs | 13 ++ .../ChunkedResponseTests.cs | 12 + .../ConnectionAdapterTests.cs | 6 + .../ConnectionLimitTests.cs | 115 +++++----- .../DefaultHeaderTests.cs | 3 +- .../EventSourceTests.cs | 4 +- .../Http2/TlsTests.cs | 1 + .../HttpConnectionManagerTests.cs | 6 +- .../HttpProtocolSelectionTests.cs | 2 + .../HttpsConnectionAdapterTests.cs | 17 ++ .../InMemory.FunctionalTests/HttpsTests.cs | 11 +- .../KeepAliveTimeoutTests.cs | 208 ++++++++++-------- .../LoggingConnectionAdapterTests.cs | 11 +- .../MaxRequestBodySizeTests.cs | 13 +- .../MaxRequestLineSizeTests.cs | 4 +- .../RequestBodyTimeoutTests.cs | 5 +- .../RequestHeaderLimitsTests.cs | 6 +- .../RequestHeadersTimeoutTests.cs | 86 ++++---- .../RequestTargetProcessingTests.cs | 5 +- .../InMemory.FunctionalTests/RequestTests.cs | 28 ++- .../ResponseDrainingTests.cs | 3 +- .../InMemory.FunctionalTests/ResponseTests.cs | 60 ++++- .../TestTransport/TestServer.cs | 7 +- .../InMemory.FunctionalTests/UpgradeTests.cs | 89 ++++---- 25 files changed, 478 insertions(+), 243 deletions(-) diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs index 962c725cef..4657c3e6aa 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs @@ -166,6 +166,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests ""); await ReceiveBadRequestResponse(connection, "400 Bad Request", server.Context.DateHeaderValue); } + + await server.StopAsync(); } Assert.All(TestSink.Writes, w => Assert.InRange(w.LogLevel, LogLevel.Trace, LogLevel.Information)); @@ -185,6 +187,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await client.Receive("HTTP/1.1 400"); } + + await server.StopAsync(); } } @@ -206,6 +210,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.SendAll(request); await ReceiveBadRequestResponse(connection, expectedResponseStatusCode, server.Context.DateHeaderValue, expectedAllowHeader); } + + await server.StopAsync(); } mockKestrelTrace.Verify(trace => trace.ConnectionBadRequest(It.IsAny(), It.IsAny())); diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs index 5b176f6c57..03ba3d3c23 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs @@ -114,6 +114,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Goodbye"); } + + await server.StopAsync(); } } @@ -168,6 +170,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World"); } + await server.StopAsync(); } } @@ -253,6 +256,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.Send(fullRequest); await connection.Receive(expectedFullResponse); } + + await server.StopAsync(); } } @@ -297,6 +302,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -338,6 +344,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -424,6 +431,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.Send(fullRequest); await connection.Receive(expectedFullResponse); } + await server.StopAsync(); } } @@ -467,6 +475,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -511,6 +520,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -615,6 +625,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -662,6 +673,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var badReqEx = await exTcs.Task.TimeoutAfter(TestConstants.DefaultTimeout); Assert.Equal(RequestRejectionReason.UnexpectedEndOfRequestContent, badReqEx.Reason); } + + await server.StopAsync(); } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedResponseTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedResponseTests.cs index bbbc9d5489..9ef6ee5417 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedResponseTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedResponseTests.cs @@ -47,6 +47,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -75,6 +76,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World!"); } + await server.StopAsync(); } } @@ -111,6 +113,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -147,6 +150,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -183,6 +187,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -227,6 +232,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -257,6 +263,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -290,6 +297,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "Hello World!", ""); } + await server.StopAsync(); } } @@ -322,6 +330,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -368,6 +377,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -406,6 +416,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + + await server.StopAsync(); } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs index a9b3cf0803..3a9a543147 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs @@ -43,6 +43,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World!"); } + await server.StopAsync(); } Assert.Equal(sendString.Length, adapter.BytesRead); @@ -74,6 +75,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World!"); } + await server.StopAsync(); } } @@ -95,6 +97,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests connection.ShutdownSend(); await connection.WaitForConnectionClose(); } + await server.StopAsync(); } } @@ -116,6 +119,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests connection.ShutdownSend(); await connection.WaitForConnectionClose(); } + await server.StopAsync(); } } @@ -162,6 +166,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.WaitForConnectionClose(); } + await server.StopAsync(); } Assert.Contains(TestApplicationErrorLogger.Messages, m => m.Message.Contains($"Uncaught exception from the {nameof(IConnectionAdapter.OnConnectionAsync)} method of an {nameof(IConnectionAdapter)}.")); @@ -197,6 +202,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World!"); } + await server.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs index 39434509a6..a8625bfb99 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -36,12 +36,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await context.Response.WriteAsync("Hello"); await requestTcs.Task; }, counter)) - using (var connection = server.CreateConnection()) { - await connection.SendEmptyGetAsKeepAlive(); ; - await connection.Receive("HTTP/1.1 200 OK"); - Assert.True(await lockedTcs.Task.DefaultTimeout()); - requestTcs.TrySetResult(null); + using (var connection = server.CreateConnection()) + { + await connection.SendEmptyGetAsKeepAlive(); ; + await connection.Receive("HTTP/1.1 200 OK"); + Assert.True(await lockedTcs.Task.DefaultTimeout()); + requestTcs.TrySetResult(null); + } + + await server.StopAsync(); } await releasedTcs.Task.DefaultTimeout(); @@ -63,33 +67,36 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } } }, max: 1)) - using (var disposables = new DisposableStack()) { - var upgraded = server.CreateConnection(); - disposables.Push(upgraded); - - await upgraded.SendEmptyGetWithUpgrade(); - await upgraded.Receive("HTTP/1.1 101"); - // once upgraded, normal connection limit is decreased to allow room for more "normal" connections - - var connection = server.CreateConnection(); - disposables.Push(connection); - - await connection.SendEmptyGetAsKeepAlive(); - await connection.Receive("HTTP/1.1 200 OK"); - - using (var rejected = server.CreateConnection()) + using (var disposables = new DisposableStack()) { - try - { - // this may throw IOException, depending on how fast Kestrel closes the socket - await rejected.SendEmptyGetAsKeepAlive(); - } - catch { } + var upgraded = server.CreateConnection(); + disposables.Push(upgraded); - // connection should close without sending any data - await rejected.WaitForConnectionClose(); + await upgraded.SendEmptyGetWithUpgrade(); + await upgraded.Receive("HTTP/1.1 101"); + // once upgraded, normal connection limit is decreased to allow room for more "normal" connections + + var connection = server.CreateConnection(); + disposables.Push(connection); + + await connection.SendEmptyGetAsKeepAlive(); + await connection.Receive("HTTP/1.1 200 OK"); + + using (var rejected = server.CreateConnection()) + { + try + { + // this may throw IOException, depending on how fast Kestrel closes the socket + await rejected.SendEmptyGetAsKeepAlive(); + } + catch { } + + // connection should close without sending any data + await rejected.WaitForConnectionClose(); + } } + await server.StopAsync(); } } @@ -104,35 +111,38 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await context.Response.WriteAsync("Hello"); await requestTcs.Task; }, max)) - using (var disposables = new DisposableStack()) { - for (var i = 0; i < max; i++) + using (var disposables = new DisposableStack()) { - var connection = server.CreateConnection(); - disposables.Push(connection); - - await connection.SendEmptyGetAsKeepAlive(); - await connection.Receive("HTTP/1.1 200 OK"); - } - - // limit has been reached - for (var i = 0; i < 10; i++) - { - using (var connection = server.CreateConnection()) + for (var i = 0; i < max; i++) { - try - { - // this may throw IOException, depending on how fast Kestrel closes the socket - await connection.SendEmptyGetAsKeepAlive(); - } - catch { } + var connection = server.CreateConnection(); + disposables.Push(connection); - // connection should close without sending any data - await connection.WaitForConnectionClose(); + await connection.SendEmptyGetAsKeepAlive(); + await connection.Receive("HTTP/1.1 200 OK"); } - } - requestTcs.TrySetResult(null); + // limit has been reached + for (var i = 0; i < 10; i++) + { + using (var connection = server.CreateConnection()) + { + try + { + // this may throw IOException, depending on how fast Kestrel closes the socket + await connection.SendEmptyGetAsKeepAlive(); + } + catch { } + + // connection should close without sending any data + await connection.WaitForConnectionClose(); + } + } + + requestTcs.TrySetResult(null); + } + await server.StopAsync(); } } @@ -189,6 +199,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await closedTcs.Task.TimeoutAfter(TimeSpan.FromSeconds(120)); Assert.Equal(count, opened); Assert.Equal(count, closed); + await server.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/DefaultHeaderTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/DefaultHeaderTests.cs index 19cd772d2b..fd6b06621f 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/DefaultHeaderTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/DefaultHeaderTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; @@ -45,6 +45,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs index 5c1c8b6cc8..37ad630bc1 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Concurrent; @@ -47,6 +47,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests .DefaultTimeout(); await connection.Receive("HTTP/1.1 200"); } + + await server.StopAsync(); } // capture list here as other tests executing in parallel may log events diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs index 85c05798a6..03c276c676 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs @@ -65,6 +65,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.Http2 await WaitForConnectionErrorAsync(reader, ignoreNonGoAwayFrames: false, expectedLastStreamId: 0, expectedErrorCode: Http2ErrorCode.INADEQUATE_SECURITY); reader.Complete(); } + await server.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpConnectionManagerTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpConnectionManagerTests.cs index 2ffa932aba..4a5cf48e15 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpConnectionManagerTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpConnectionManagerTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { public class HttpConnectionManagerTests : LoggedTest { -// This test causes MemoryPoolBlocks to be finalized which in turn causes an assert failure in debug builds. + // This test causes MemoryPoolBlocks to be finalized which in turn causes an assert failure in debug builds. #if !DEBUG [ConditionalFact] [NoDebuggerCondition] @@ -69,6 +69,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } Assert.True(logWaitAttempts < 10); + + await server.StopAsync(); } } #endif diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpProtocolSelectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpProtocolSelectionTests.cs index a5765579f5..af1ae592e1 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpProtocolSelectionTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpProtocolSelectionTests.cs @@ -70,6 +70,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.Send(request); await connection.Receive(expectedResponse); } + await server.StopAsync(); } } @@ -88,6 +89,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { await connection.WaitForConnectionClose(); } + await server.StopAsync(); } Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionAdapterTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionAdapterTests.cs index ae9434642d..e7d8365ced 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionAdapterTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionAdapterTests.cs @@ -50,6 +50,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests validateCertificate: false); Assert.Equal("content=Hello+World%3F", result); + await server.StopAsync(); } } @@ -81,6 +82,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { var result = await server.HttpClientSlim.GetStringAsync($"https://localhost:{server.Port}/", validateCertificate: false); Assert.Equal("hello world", result); + await server.StopAsync(); } } @@ -104,6 +106,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { await Assert.ThrowsAnyAsync( () => server.HttpClientSlim.GetStringAsync($"https://localhost:{server.Port}/")); + await server.StopAsync(); } } @@ -132,6 +135,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { var result = await server.HttpClientSlim.GetStringAsync($"https://localhost:{server.Port}/", validateCertificate: false); Assert.Equal("hello world", result); + await server.StopAsync(); } } @@ -165,6 +169,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await stream.AuthenticateAsClientAsync("localhost", new X509CertificateCollection(), SslProtocols.Tls12 | SslProtocols.Tls11, false); Assert.True(stream.RemoteCertificate.Equals(_x509Certificate2)); } + await server.StopAsync(); } } @@ -201,6 +206,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests Assert.True(stream.RemoteCertificate.Equals(_x509Certificate2)); Assert.Equal(1, selectorCalled); } + await server.StopAsync(); } } @@ -251,6 +257,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests Assert.True(stream.RemoteCertificate.Equals(_x509Certificate2NoExt)); Assert.Equal(2, selectorCalled); } + await server.StopAsync(); } } @@ -284,6 +291,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests stream.AuthenticateAsClientAsync("localhost", new X509CertificateCollection(), SslProtocols.Tls12 | SslProtocols.Tls11, false)); Assert.Equal(1, selectorCalled); } + await server.StopAsync(); } } @@ -321,6 +329,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests Assert.True(stream.RemoteCertificate.Equals(_x509Certificate2)); Assert.Equal(1, selectorCalled); } + await server.StopAsync(); } } @@ -354,6 +363,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests stream.AuthenticateAsClientAsync("localhost", new X509CertificateCollection(), SslProtocols.Tls12 | SslProtocols.Tls11, false)); Assert.Equal(1, selectorCalled); } + await server.StopAsync(); } } @@ -394,6 +404,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await stream.AuthenticateAsClientAsync("localhost", new X509CertificateCollection(), SslProtocols.Tls12 | SslProtocols.Tls11, false); await AssertConnectionResult(stream, true); } + await server.StopAsync(); } } @@ -412,6 +423,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { var result = await server.HttpClientSlim.GetStringAsync($"https://localhost:{server.Port}/", validateCertificate: false); Assert.Equal("https", result); + await server.StopAsync(); } } @@ -442,6 +454,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var ex = await Assert.ThrowsAsync( async () => await stream.AuthenticateAsClientAsync("localhost", new X509CertificateCollection(), SslProtocols.Tls, false)); } + await server.StopAsync(); } } @@ -479,6 +492,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await AssertConnectionResult(stream, true); Assert.True(clientCertificateValidationCalled); } + await server.StopAsync(); } } @@ -508,6 +522,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await stream.AuthenticateAsClientAsync("localhost", new X509CertificateCollection(), SslProtocols.Tls12 | SslProtocols.Tls11, false); await AssertConnectionResult(stream, false); } + await server.StopAsync(); } } @@ -536,6 +551,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await stream.AuthenticateAsClientAsync("localhost", new X509CertificateCollection(), SslProtocols.Tls12 | SslProtocols.Tls11, false); await AssertConnectionResult(stream, false); } + await server.StopAsync(); } } @@ -576,6 +592,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await stream.AuthenticateAsClientAsync("localhost", new X509CertificateCollection(), SslProtocols.Tls12 | SslProtocols.Tls11, false); await AssertConnectionResult(stream, true); } + await server.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs index d386500e68..a2848925b8 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -134,6 +134,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } await loggerProvider.FilterLogger.LogTcs.Task.DefaultTimeout(); + await server.StopAsync(); } Assert.Equal(1, loggerProvider.FilterLogger.LastEventId.Id); @@ -162,6 +163,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } await loggerProvider.FilterLogger.LogTcs.Task.DefaultTimeout(); + await server.StopAsync(); } Assert.Equal(1, loggerProvider.FilterLogger.LastEventId.Id); @@ -211,6 +213,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await sslStream.ReadAsync(new byte[32], 0, 32); } + await server.StopAsync(); } Assert.False(loggerProvider.ErrorLogger.ObjectDisposedExceptionLogged); @@ -280,6 +283,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests enabledSslProtocols: SslProtocols.Tls11 | SslProtocols.Tls12, checkCertificateRevocation: false); } + await server.StopAsync(); } Assert.False(loggerProvider.ErrorLogger.ObjectDisposedExceptionLogged); @@ -287,7 +291,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests // Regression test for https://github.com/aspnet/KestrelHttpServer/pull/1197 [Fact] - public void ConnectionFilterDoesNotLeakBlock() + public async Task ConnectionFilterDoesNotLeakBlock() { var loggerProvider = new HandshakeErrorLoggerProvider(); LoggerFactory.AddProvider(loggerProvider); @@ -303,6 +307,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { connection.Reset(); } + await server.StopAsync(); } } @@ -343,6 +348,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests Assert.Equal(0, await connection.Stream.ReadAsync(new byte[1], 0, 1).DefaultTimeout()); } + await server.StopAsync(); } await loggerProvider.FilterLogger.LogTcs.Task.DefaultTimeout(); @@ -372,6 +378,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests enabledSslProtocols: SslProtocols.Tls, checkCertificateRevocation: false)); } + await server.StopAsync(); } await loggerProvider.FilterLogger.LogTcs.Task.DefaultTimeout(); diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/KeepAliveTimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/KeepAliveTimeoutTests.cs index 716ff9583a..80c5061719 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/KeepAliveTimeoutTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/KeepAliveTimeoutTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -30,20 +30,23 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager); using (var server = CreateServer(testContext)) - using (var connection = server.CreateConnection()) { - await connection.Send( - "GET / HTTP/1.1", - "Host:", - "", - ""); - await ReceiveResponse(connection, testContext); + using (var connection = server.CreateConnection()) + { + await connection.Send( + "GET / HTTP/1.1", + "Host:", + "", + ""); + await ReceiveResponse(connection, testContext); - // Min amount of time between requests that triggers a keep-alive timeout. - testContext.MockSystemClock.UtcNow += _keepAliveTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); - heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + // Min amount of time between requests that triggers a keep-alive timeout. + testContext.MockSystemClock.UtcNow += _keepAliveTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); + heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); - await connection.WaitForConnectionClose(); + await connection.WaitForConnectionClose(); + } + await server.StopAsync(); } } @@ -54,21 +57,24 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager); using (var server = CreateServer(testContext)) - using (var connection = server.CreateConnection()) { - for (var i = 0; i < 10; i++) + using (var connection = server.CreateConnection()) { - await connection.Send( - "GET / HTTP/1.1", - "Host:", - "", - ""); - await ReceiveResponse(connection, testContext); + for (var i = 0; i < 10; i++) + { + await connection.Send( + "GET / HTTP/1.1", + "Host:", + "", + ""); + await ReceiveResponse(connection, testContext); - // Max amount of time between requests that doesn't trigger a keep-alive timeout. - testContext.MockSystemClock.UtcNow += _keepAliveTimeout + Heartbeat.Interval; - heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + // Max amount of time between requests that doesn't trigger a keep-alive timeout. + testContext.MockSystemClock.UtcNow += _keepAliveTimeout + Heartbeat.Interval; + heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + } } + await server.StopAsync(); } } @@ -79,33 +85,36 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager); using (var server = CreateServer(testContext)) - using (var connection = server.CreateConnection()) { - await connection.Send( - "POST /consume HTTP/1.1", - "Host:", - "Transfer-Encoding: chunked", - "", - ""); - - await _firstRequestReceived.Task.DefaultTimeout(); - - for (var totalDelay = TimeSpan.Zero; totalDelay < _longDelay; totalDelay += _shortDelay) + using (var connection = server.CreateConnection()) { await connection.Send( - "1", - "a", - ""); + "POST /consume HTTP/1.1", + "Host:", + "Transfer-Encoding: chunked", + "", + ""); - testContext.MockSystemClock.UtcNow += _shortDelay; - heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + await _firstRequestReceived.Task.DefaultTimeout(); + + for (var totalDelay = TimeSpan.Zero; totalDelay < _longDelay; totalDelay += _shortDelay) + { + await connection.Send( + "1", + "a", + ""); + + testContext.MockSystemClock.UtcNow += _shortDelay; + heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + } + + await connection.Send( + "0", + "", + ""); + await ReceiveResponse(connection, testContext); } - - await connection.Send( - "0", - "", - ""); - await ReceiveResponse(connection, testContext); + await server.StopAsync(); } } @@ -117,32 +126,35 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var cts = new CancellationTokenSource(); using (var server = CreateServer(testContext, longRunningCt: cts.Token)) - using (var connection = server.CreateConnection()) { - await connection.Send( - "GET /longrunning HTTP/1.1", - "Host:", - "", - ""); - - await _firstRequestReceived.Task.DefaultTimeout(); - - for (var totalDelay = TimeSpan.Zero; totalDelay < _longDelay; totalDelay += _shortDelay) + using (var connection = server.CreateConnection()) { - testContext.MockSystemClock.UtcNow += _shortDelay; - heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + await connection.Send( + "GET /longrunning HTTP/1.1", + "Host:", + "", + ""); + + await _firstRequestReceived.Task.DefaultTimeout(); + + for (var totalDelay = TimeSpan.Zero; totalDelay < _longDelay; totalDelay += _shortDelay) + { + testContext.MockSystemClock.UtcNow += _shortDelay; + heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + } + + cts.Cancel(); + + await ReceiveResponse(connection, testContext); + + await connection.Send( + "GET / HTTP/1.1", + "Host:", + "", + ""); + await ReceiveResponse(connection, testContext); } - - cts.Cancel(); - - await ReceiveResponse(connection, testContext); - - await connection.Send( - "GET / HTTP/1.1", - "Host:", - "", - ""); - await ReceiveResponse(connection, testContext); + await server.StopAsync(); } } @@ -153,13 +165,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager); using (var server = CreateServer(testContext)) - using (var connection = server.CreateConnection()) { - // Min amount of time between requests that triggers a keep-alive timeout. - testContext.MockSystemClock.UtcNow += _keepAliveTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); - heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + using (var connection = server.CreateConnection()) + { + // Min amount of time between requests that triggers a keep-alive timeout. + testContext.MockSystemClock.UtcNow += _keepAliveTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); + heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); - await connection.WaitForConnectionClose(); + await connection.WaitForConnectionClose(); + } + await server.StopAsync(); } } @@ -171,30 +186,33 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var cts = new CancellationTokenSource(); using (var server = CreateServer(testContext, upgradeCt: cts.Token)) - using (var connection = server.CreateConnection()) { - await connection.Send( - "GET /upgrade HTTP/1.1", - "Host:", - "Connection: Upgrade", - "", - ""); - await connection.Receive( - "HTTP/1.1 101 Switching Protocols", - "Connection: Upgrade", - $"Date: {testContext.DateHeaderValue}", - "", - ""); - - for (var totalDelay = TimeSpan.Zero; totalDelay < _longDelay; totalDelay += _shortDelay) + using (var connection = server.CreateConnection()) { - testContext.MockSystemClock.UtcNow += _shortDelay; - heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + await connection.Send( + "GET /upgrade HTTP/1.1", + "Host:", + "Connection: Upgrade", + "", + ""); + await connection.Receive( + "HTTP/1.1 101 Switching Protocols", + "Connection: Upgrade", + $"Date: {testContext.DateHeaderValue}", + "", + ""); + + for (var totalDelay = TimeSpan.Zero; totalDelay < _longDelay; totalDelay += _shortDelay) + { + testContext.MockSystemClock.UtcNow += _shortDelay; + heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + } + + cts.Cancel(); + + await connection.Receive("hello, world"); } - - cts.Cancel(); - - await connection.Receive("hello, world"); + await server.StopAsync(); } } @@ -263,4 +281,4 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests return tcs.Task; } } -} \ No newline at end of file +} diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionAdapterTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionAdapterTests.cs index cba0db84bd..ae8ad7768f 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionAdapterTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionAdapterTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; @@ -29,11 +29,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests listenOptions.UseConnectionLogging(); })) { - var response = await server.HttpClientSlim.GetStringAsync($"https://localhost:{server.Port}/", validateCertificate: false) - .DefaultTimeout(); + { + var response = await server.HttpClientSlim.GetStringAsync($"https://localhost:{server.Port}/", validateCertificate: false) + .DefaultTimeout(); - Assert.Equal("Hello World!", response); + Assert.Equal("Hello World!", response); + } + await server.StopAsync(); } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/MaxRequestBodySizeTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/MaxRequestBodySizeTests.cs index dc48146ca7..bc2fa11687 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/MaxRequestBodySizeTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/MaxRequestBodySizeTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -48,6 +48,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.NotNull(requestRejectedEx); @@ -94,6 +95,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.NotNull(requestRejectedEx); @@ -137,6 +139,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "A"); } + await server.StopAsync(); } } @@ -169,6 +172,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -209,6 +213,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.NotNull(invalidOpEx); @@ -248,6 +253,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests ""); await connection.ReceiveEnd(); } + await server.StopAsync(); } Assert.NotNull(invalidOpEx); @@ -287,6 +293,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.NotNull(requestRejectedEx1); @@ -334,6 +341,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.NotNull(requestRejectedEx); @@ -379,6 +387,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -447,6 +456,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.NotNull(requestRejectedEx); @@ -486,6 +496,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.NotNull(requestRejectedEx1); diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/MaxRequestLineSizeTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/MaxRequestLineSizeTests.cs index 67255991c0..80f1692ba2 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/MaxRequestLineSizeTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/MaxRequestLineSizeTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; @@ -44,6 +44,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -67,6 +68,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestBodyTimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestBodyTimeoutTests.cs index a26141b93b..ae659dbb34 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestBodyTimeoutTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestBodyTimeoutTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -88,6 +88,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -133,6 +134,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.Contains(TestSink.Writes, w => w.EventId.Id == 32 && w.LogLevel == LogLevel.Information); @@ -206,6 +208,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "hello, world"); } + await server.StopAsync(); } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeaderLimitsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeaderLimitsTests.cs index 7ce9cea8e2..bf26bf13ab 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeaderLimitsTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeaderLimitsTests.cs @@ -43,6 +43,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -75,6 +76,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -98,6 +100,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -122,6 +125,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -156,4 +160,4 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests }); } } -} \ No newline at end of file +} diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeadersTimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeadersTimeoutTests.cs index 333ce24f82..0701536fe9 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeadersTimeoutTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeadersTimeoutTests.cs @@ -29,17 +29,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager); using (var server = CreateServer(testContext)) - using (var connection = server.CreateConnection()) { - await connection.Send( - "GET / HTTP/1.1", - headers); + using (var connection = server.CreateConnection()) + { + await connection.Send( + "GET / HTTP/1.1", + headers); - // Min amount of time between requests that triggers a request headers timeout. - testContext.MockSystemClock.UtcNow += RequestHeadersTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); - heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + // Min amount of time between requests that triggers a request headers timeout. + testContext.MockSystemClock.UtcNow += RequestHeadersTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); + heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); - await ReceiveTimeoutResponse(connection, testContext); + await ReceiveTimeoutResponse(connection, testContext); + } + await server.StopAsync(); } } @@ -50,23 +53,26 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager); using (var server = CreateServer(testContext)) - using (var connection = server.CreateConnection()) { - await connection.Send( - "POST / HTTP/1.1", - "Host:", - "Content-Length: 1", - "", - ""); + using (var connection = server.CreateConnection()) + { + await connection.Send( + "POST / HTTP/1.1", + "Host:", + "Content-Length: 1", + "", + ""); - // Min amount of time between requests that triggers a request headers timeout. - testContext.MockSystemClock.UtcNow += RequestHeadersTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); - heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + // Min amount of time between requests that triggers a request headers timeout. + testContext.MockSystemClock.UtcNow += RequestHeadersTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); + heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); - await connection.Send( - "a"); + await connection.Send( + "a"); - await ReceiveResponse(connection, testContext); + await ReceiveResponse(connection, testContext); + } + await server.StopAsync(); } } @@ -79,15 +85,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager); using (var server = CreateServer(testContext)) - using (var connection = server.CreateConnection()) { - await connection.Send(requestLine); + using (var connection = server.CreateConnection()) + { + await connection.Send(requestLine); - // Min amount of time between requests that triggers a request headers timeout. - testContext.MockSystemClock.UtcNow += RequestHeadersTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); - heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + // Min amount of time between requests that triggers a request headers timeout. + testContext.MockSystemClock.UtcNow += RequestHeadersTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); + heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); - await ReceiveTimeoutResponse(connection, testContext); + await ReceiveTimeoutResponse(connection, testContext); + } + await server.StopAsync(); } } @@ -101,19 +110,22 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests testContext.ServerOptions.Limits.MinResponseDataRate = null; using (var server = CreateServer(testContext)) - using (var connection = server.CreateConnection()) { - foreach (var ch in "POST / HTTP/1.1\r\nHost:\r\n\r\n") + using (var connection = server.CreateConnection()) { - await connection.Send(ch.ToString()); + foreach (var ch in "POST / HTTP/1.1\r\nHost:\r\n\r\n") + { + await connection.Send(ch.ToString()); - testContext.MockSystemClock.UtcNow += ShortDelay; - heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + testContext.MockSystemClock.UtcNow += ShortDelay; + heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); + } + + await ReceiveTimeoutResponse(connection, testContext); + + await connection.WaitForConnectionClose(); } - - await ReceiveTimeoutResponse(connection, testContext); - - await connection.WaitForConnectionClose(); + await server.StopAsync(); } } @@ -156,4 +168,4 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests ""); } } -} \ No newline at end of file +} diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTargetProcessingTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTargetProcessingTests.cs index e4c9b55944..62e1e6d381 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTargetProcessingTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTargetProcessingTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; @@ -42,6 +42,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World"); } + await server.StopAsync(); } } @@ -87,6 +88,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World"); } + await server.StopAsync(); } } @@ -126,6 +128,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World"); } + await server.StopAsync(); } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs index c00978bc3b..47d78866ee 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -53,6 +53,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests Assert.False(requestBodyPersisted); Assert.False(responseBodyPersisted); + + await server.StopAsync(); } } @@ -119,6 +121,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Read cancelled"); } + await server.StopAsync(); } } @@ -153,6 +156,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.True(dataRead); @@ -224,6 +228,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests Assert.Equal(queryValue, queryTcs.Task.Result["q"]); } } + await server.StopAsync(); } } @@ -239,6 +244,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { var requestId = await server.HttpClientSlim.GetStringAsync($"http://localhost:{server.Port}/"); Assert.Equal(knownId, requestId); + await server.StopAsync(); } } @@ -295,6 +301,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests usedIds.Add(id); } } + await server.StopAsync(); } } @@ -329,6 +336,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Goodbye"); } + await server.StopAsync(); } } @@ -369,6 +377,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World"); } + await server.StopAsync(); } } @@ -403,6 +412,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Goodbye"); } + await server.StopAsync(); } } @@ -442,6 +452,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Goodbye"); } + await server.StopAsync(); } } @@ -498,6 +509,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Goodbye"); } + await server.StopAsync(); } } @@ -530,6 +542,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World"); } + await server.StopAsync(); } } @@ -579,6 +592,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -608,6 +622,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests connection.ShutdownSend(); await connection.ReceiveEnd(); } + await server.StopAsync(); } } @@ -658,6 +673,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -695,6 +711,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", message); } + await server.StopAsync(); } } @@ -771,6 +788,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests Assert.Equal(1, streamCount); Assert.Equal(1, requestHeadersCount); Assert.Equal(1, responseHeadersCount); + await server.StopAsync(); } } @@ -789,6 +807,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.Receive("HTTP/1.1 200 OK"); } + await server.StopAsync(); } } @@ -830,6 +849,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -878,6 +898,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -904,6 +925,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -936,6 +958,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "goodbye"); } + await server.StopAsync(); } } @@ -996,6 +1019,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "hello"); } + await server.StopAsync(); } } @@ -1071,6 +1095,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello2"); } + await server.StopAsync(); } } @@ -1115,6 +1140,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseDrainingTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseDrainingTests.cs index 9cd37003c0..2bf646f823 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseDrainingTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseDrainingTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -79,6 +79,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests Assert.Single(TestApplicationErrorLogger.Messages, w => w.EventId.Id == 28 && w.LogLevel == LogLevel.Information); } + await server.StopAsync(); } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs index 4453d46a5e..beaa5a7e63 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -62,6 +62,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await onCompletedTcs.Task.DefaultTimeout(); Assert.False(onStartingCalled); } + await server.StopAsync(); } } @@ -97,6 +98,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests Assert.NotNull(ex); } + await server.StopAsync(); } } @@ -154,6 +156,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await Assert.ThrowsAsync(() => appTcs.Task).DefaultTimeout(); } + await server.StopAsync(); } } @@ -279,6 +282,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -316,6 +320,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } delayTcs.SetResult(null); + await server.StopAsync(); } } @@ -349,6 +354,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } await onCompletedTcs.Task.DefaultTimeout(); @@ -381,6 +387,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.NotNull(readException); @@ -418,6 +425,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -446,6 +454,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -470,6 +479,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -508,6 +518,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests // might be 1 by the time ProduceEnd() gets called and the message is logged. await logTcs.Task.DefaultTimeout(); } + await server.StopAsync(); } mockKestrelTrace.Verify(kestrelTrace => @@ -546,6 +557,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.WaitForConnectionClose(); } + await server.StopAsync(); } var logMessage = Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error); @@ -582,6 +594,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "hello,"); } + await server.StopAsync(); } var logMessage = Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error); @@ -621,6 +634,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } var logMessage = Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error); @@ -656,6 +670,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } var logMessage = Assert.Single(TestApplicationErrorLogger.Messages, message => message.LogLevel == LogLevel.Error); @@ -707,6 +722,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests // The server should close the connection in this situation. await connection.WaitForConnectionClose(); } + await server.StopAsync(); } mockTrace.Verify(trace => @@ -759,6 +775,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests // abort triggered by the connection RST and the abort called when // disposing the server. await requestAborted.Task.DefaultTimeout(); + await server.StopAsync(); } // With the server disposed we know all connections were drained and all messages were logged. @@ -797,6 +814,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } var error = TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error); @@ -835,6 +853,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.Empty(TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error)); @@ -871,6 +890,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "hello, world"); } + await server.StopAsync(); } Assert.Empty(TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error)); @@ -907,6 +927,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "hello, world"); } + await server.StopAsync(); } Assert.Empty(TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error)); @@ -935,6 +956,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -966,6 +988,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests flushed.SetResult(null); } + await server.StopAsync(); } } @@ -999,6 +1022,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests flushed.SetResult(null); } + await server.StopAsync(); } } @@ -1033,6 +1057,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.Receive("hello, world"); } + await server.StopAsync(); } } @@ -1074,6 +1099,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", expectedResponse); } + await server.StopAsync(); } } @@ -1119,6 +1145,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "hello, world"); } + await server.StopAsync(); } } @@ -1165,6 +1192,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "hello, world"); } + await server.StopAsync(); } } @@ -1208,6 +1236,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "hello, world"); } + await server.StopAsync(); } } @@ -1251,6 +1280,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -1297,6 +1327,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -1337,6 +1368,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -1380,6 +1412,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -1417,6 +1450,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -1445,6 +1479,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.Contains(TestApplicationErrorLogger.Messages, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException @@ -1515,6 +1550,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.ReceiveEnd(); } + await server.StopAsync(); } Assert.True(foundMessage, "Expected log not found"); @@ -1558,6 +1594,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.Contains(TestApplicationErrorLogger.Messages, w => w.EventId.Id == 17 && w.LogLevel == LogLevel.Information && w.Exception is BadHttpRequestException @@ -1608,6 +1645,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -1632,6 +1670,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World"); } + await server.StopAsync(); } } @@ -1664,6 +1703,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -1708,6 +1748,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -1731,6 +1772,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -1787,6 +1829,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -1833,6 +1876,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "hello, world"); } + await server.StopAsync(); } } @@ -1880,6 +1924,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } Assert.False(onStartingCalled); @@ -1936,6 +1981,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } // The first registered OnStarting callback should have been called, @@ -1986,6 +2032,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World"); } + await server.StopAsync(); } // All OnCompleted callbacks should be called even if they throw. @@ -2029,6 +2076,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World"); } + await server.StopAsync(); } Assert.True(onStartingCalled); @@ -2070,6 +2118,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello"); } + await server.StopAsync(); } Assert.True(onStartingCalled); @@ -2103,6 +2152,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello World"); } + await server.StopAsync(); } Assert.Empty(TestApplicationErrorLogger.Messages.Where(message => message.LogLevel == LogLevel.Error)); @@ -2128,6 +2178,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests ""); await connection.ReceiveEnd(); } + await server.StopAsync(); } } @@ -2178,6 +2229,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -2226,6 +2278,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests // Wait for all callbacks to be called. await onStartingTcs.Task.DefaultTimeout(); } + await server.StopAsync(); } Assert.Equal(1, callOrder.Pop()); @@ -2277,6 +2330,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests // Wait for all callbacks to be called. await onCompletedTcs.Task.DefaultTimeout(); } + await server.StopAsync(); } Assert.Equal(1, callOrder.Pop()); @@ -2331,6 +2385,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello2"); } + await server.StopAsync(); } } @@ -2370,6 +2425,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", "Hello!"); } + await server.StopAsync(); } } @@ -2399,6 +2455,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -2485,6 +2542,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var disposedStatusCode = await disposedTcs.Task.DefaultTimeout(); Assert.Equal(expectedServerStatusCode, (HttpStatusCode)disposedStatusCode); + await server.StopAsync(); } if (sendMalformedRequest) diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs index 17be223833..11fe0dd27b 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -90,7 +90,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTrans }); _host = hostBuilder.Build(); - _host.Start(); } @@ -132,7 +131,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTrans { try { - var middlewareTask = _transportFactory.ConnectionDispatcher.OnConnection(transportConnection); + var middlewareTask = _transportFactory.ConnectionDispatcher.OnConnection(transportConnection); var transportTask = CancellationTokenAsTask(transportConnection.ConnectionClosed); await transportTask; @@ -142,7 +141,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTrans } catch (Exception ex) { - Debug.Assert(false, $"Unexpected exception: {ex}."); + Debug.Assert(false, $"Unexpected exception: {ex}."); } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/UpgradeTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/UpgradeTests.cs index 78ee00fb4e..03e5dab1b5 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/UpgradeTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/UpgradeTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -50,6 +50,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.Receive("New protocol data"); await upgrade.Task.DefaultTimeout(); } + await server.StopAsync(); } } @@ -104,6 +105,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await upgrade.Task.DefaultTimeout(); } + await server.StopAsync(); } } @@ -131,15 +133,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await Task.Delay(100); } }, new TestServiceContext(LoggerFactory))) - using (var connection = server.CreateConnection()) { - await connection.SendEmptyGetWithUpgrade(); - await connection.Receive("HTTP/1.1 101 Switching Protocols", - "Connection: Upgrade", - $"Date: {server.Context.DateHeaderValue}", - "", - ""); - await connection.WaitForConnectionClose(); + using (var connection = server.CreateConnection()) + { + await connection.SendEmptyGetWithUpgrade(); + await connection.Receive("HTTP/1.1 101 Switching Protocols", + "Connection: Upgrade", + $"Date: {server.Context.DateHeaderValue}", + "", + ""); + await connection.WaitForConnectionClose(); + } + await server.StopAsync(); } var ex = await Assert.ThrowsAsync(async () => await upgradeTcs.Task.DefaultTimeout()); @@ -150,22 +155,25 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests public async Task RejectsRequestWithContentLengthAndUpgrade() { using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory))) - using (var connection = server.CreateConnection()) { - await connection.Send("POST / HTTP/1.1", - "Host:", - "Content-Length: 1", - "Connection: Upgrade", - "", - ""); + using (var connection = server.CreateConnection()) + { + await connection.Send("POST / HTTP/1.1", + "Host:", + "Content-Length: 1", + "Connection: Upgrade", + "", + ""); - await connection.ReceiveEnd( - "HTTP/1.1 400 Bad Request", - "Connection: close", - $"Date: {server.Context.DateHeaderValue}", - "Content-Length: 0", - "", - ""); + await connection.ReceiveEnd( + "HTTP/1.1 400 Bad Request", + "Connection: close", + $"Date: {server.Context.DateHeaderValue}", + "Content-Length: 0", + "", + ""); + } + await server.StopAsync(); } } @@ -190,6 +198,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.SendEmptyGetWithUpgrade(); await connection.Receive("HTTP/1.1 200 OK"); } + await server.StopAsync(); } } @@ -197,21 +206,24 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests public async Task RejectsRequestWithChunkedEncodingAndUpgrade() { using (var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory))) - using (var connection = server.CreateConnection()) { - await connection.Send("POST / HTTP/1.1", - "Host:", - "Transfer-Encoding: chunked", - "Connection: Upgrade", - "", - ""); - await connection.ReceiveEnd( - "HTTP/1.1 400 Bad Request", - "Connection: close", - $"Date: {server.Context.DateHeaderValue}", - "Content-Length: 0", - "", - ""); + using (var connection = server.CreateConnection()) + { + await connection.Send("POST / HTTP/1.1", + "Host:", + "Transfer-Encoding: chunked", + "Connection: Upgrade", + "", + ""); + await connection.ReceiveEnd( + "HTTP/1.1 400 Bad Request", + "Connection: close", + $"Date: {server.Context.DateHeaderValue}", + "Content-Length: 0", + "", + ""); + } + await server.StopAsync(); } } @@ -242,6 +254,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.SendEmptyGet(); await connection.Receive("HTTP/1.1 200 OK"); } + await server.StopAsync(); } var ex = await Assert.ThrowsAsync(async () => await upgradeTcs.Task).DefaultTimeout(); @@ -293,6 +306,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests await connection.Receive("HTTP/1.1 200"); } } + await server.StopAsync(); } var exception = await Assert.ThrowsAsync(async () => await upgradeTcs.Task.TimeoutAfter(TimeSpan.FromSeconds(60))); @@ -333,6 +347,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } await appCompletedTcs.Task.DefaultTimeout(); + await server.StopAsync(); } } } From 712b01d06364e198f7bf03719aa0a8bd3a72e6c5 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sun, 30 Dec 2018 02:31:30 -0400 Subject: [PATCH 30/80] Prevent blocking threads (#6190) - Call StopAsync and StartAsync on the Host and TestServer in more places --- .../BindTests/AddressRegistrationTests.cs | 48 ++++++++++++----- .../FunctionalTests/ConnectionAdapterTests.cs | 1 + .../FunctionalTests/Http2/HandshakeTests.cs | 3 ++ .../MaxRequestBufferSizeTests.cs | 12 +++-- .../test/FunctionalTests/RequestTests.cs | 51 ++++++++++++++----- .../test/FunctionalTests/ResponseTests.cs | 16 +++++- .../Interop.FunctionalTests/ChromeTests.cs | 2 + .../Interop.FunctionalTests/H2SpecTests.cs | 2 + .../ListenHandleTests.cs | 3 +- 9 files changed, 105 insertions(+), 33 deletions(-) diff --git a/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs b/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs index 972941e72d..e8e989f1be 100644 --- a/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs +++ b/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs @@ -297,7 +297,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); var testUrlWithPort = $"{testUrl}:{(testPort == 0 ? host.GetPort() : testPort)}"; @@ -309,6 +309,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // Compare the response with Uri.ToString(), rather than testUrl directly. // Required to handle IPv6 addresses with zone index, like "fe80::3%1" Assert.Equal(new Uri(testUrlWithPort).ToString(), response); + + await host.StopAsync(); } } @@ -348,7 +350,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); foreach (var testUrl in testUrls.Select(testUrl => $"{testUrl}:{(testPort == 0 ? host.GetPort() : testPort)}")) { @@ -358,6 +360,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // Required to handle IPv6 addresses with zone index, like "fe80::3%1" Assert.Equal(new Uri(testUrl).ToString(), response); } + + await host.StopAsync(); } } @@ -389,7 +393,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); foreach (var testUrl in testUrls.Select(testUrl => $"{testUrl}:{(testPort == 0 ? host.GetPort() : testPort)}")) { @@ -399,6 +403,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // Required to handle IPv6 addresses with zone index, like "fe80::3%1" Assert.Equal(new Uri(testUrl).ToString(), response); } + + await host.StopAsync(); } } @@ -468,7 +474,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); Assert.Equal(5000, host.GetPort()); @@ -485,6 +491,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { Assert.Equal(new Uri(address).ToString(), await HttpClientSlim.GetStringAsync(address, validateCertificate: false)); } + + await host.StopAsync(); } } @@ -555,7 +563,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); var port = host.GetPort(); @@ -571,6 +579,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests log.Message, StringComparison.Ordinal)); Assert.Equal(new Uri(useUrlsAddressWithPort).ToString(), await HttpClientSlim.GetStringAsync(useUrlsAddressWithPort)); + + await host.StopAsync(); } } @@ -594,7 +604,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); var port = host.GetPort(); @@ -610,6 +620,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests log.Message, StringComparison.Ordinal)); Assert.Equal(new Uri(endPointAddress).ToString(), await HttpClientSlim.GetStringAsync(endPointAddress, validateCertificate: false)); + await host.StopAsync(); } } @@ -630,7 +641,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); var port = host.GetPort(); @@ -641,6 +652,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.Equal(serverAddresses.First(), endPointAddress); Assert.Equal(new Uri(endPointAddress).ToString(), await HttpClientSlim.GetStringAsync(endPointAddress, validateCertificate: false)); + + await host.StopAsync(); } } @@ -709,9 +722,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); Assert.Equal(endPointAddress, await HttpClientSlim.GetStringAsync(endPointAddress)); + + await host.StopAsync(); } hostBuilder = TransportSelector.GetWebHostBuilder() @@ -723,9 +738,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); Assert.Equal(endPointAddress, await HttpClientSlim.GetStringAsync(endPointAddress)); + + await host.StopAsync(); } } @@ -748,10 +765,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); Assert.Equal(ipv4endPointAddress, await HttpClientSlim.GetStringAsync(ipv4endPointAddress)); Assert.Equal(ipv6endPointAddress, await HttpClientSlim.GetStringAsync(ipv6endPointAddress)); + + await host.StopAsync(); } hostBuilder = TransportSelector.GetWebHostBuilder() @@ -764,10 +783,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); Assert.Equal(ipv4endPointAddress, await HttpClientSlim.GetStringAsync(ipv4endPointAddress)); Assert.Equal(ipv6endPointAddress, await HttpClientSlim.GetStringAsync(ipv6endPointAddress)); + + await host.StopAsync(); } } @@ -775,7 +796,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests [InlineData("http1", HttpProtocols.Http1)] [InlineData("http2", HttpProtocols.Http2)] [InlineData("http1AndHttp2", HttpProtocols.Http1AndHttp2)] - public void EndpointDefaultsConfig_CanSetProtocolForUrlsConfig(string input, HttpProtocols expected) + public async Task EndpointDefaultsConfig_CanSetProtocolForUrlsConfig(string input, HttpProtocols expected) { KestrelServerOptions capturedOptions = null; var hostBuilder = TransportSelector.GetWebHostBuilder() @@ -795,9 +816,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); Assert.Single(capturedOptions.ListenOptions); Assert.Equal(expected, capturedOptions.ListenOptions[0].Protocols); + await host.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/FunctionalTests/ConnectionAdapterTests.cs b/src/Servers/Kestrel/test/FunctionalTests/ConnectionAdapterTests.cs index 704f521d64..9e0f462a83 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/ConnectionAdapterTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/ConnectionAdapterTests.cs @@ -44,6 +44,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } }); } + await server.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs index 446be393dc..76e85f21df 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs @@ -63,6 +63,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2 { var result = await Client.GetStringAsync($"https://localhost:{server.Port}/"); Assert.Equal("hello world HTTP/2", result); + + await server.StopAsync(); } } @@ -89,6 +91,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2 { var result = await Client.GetStringAsync($"https://localhost:{server.Port}/"); Assert.Equal("hello world HTTP/2", result); + await server.StopAsync(); } } } diff --git a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs index ad087574b2..057ccf1fec 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -132,7 +132,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var memoryPoolFactory = new DiagnosticMemoryPoolFactory(allowLateReturn: true); - using (var host = StartWebHost(maxRequestBufferSize, data, connectionAdapter, startReadingRequestBody, clientFinishedSendingRequestBody, memoryPoolFactory.Create)) + using (var host = await StartWebHost(maxRequestBufferSize, data, connectionAdapter, startReadingRequestBody, clientFinishedSendingRequestBody, memoryPoolFactory.Create)) { var port = host.GetPort(); using (var socket = CreateSocket(port)) @@ -204,6 +204,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await AssertStreamContains(stream, $"bytesRead: {data.Length}"); } + await host.StopAsync(); } await memoryPoolFactory.WhenAllBlocksReturned(TestConstants.DefaultTimeout); @@ -224,7 +225,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var memoryPoolFactory = new DiagnosticMemoryPoolFactory(allowLateReturn: true); - using (var host = StartWebHost(16 * 1024, data, false, startReadingRequestBody, clientFinishedSendingRequestBody, memoryPoolFactory.Create)) + using (var host = await StartWebHost(16 * 1024, data, false, startReadingRequestBody, clientFinishedSendingRequestBody, memoryPoolFactory.Create)) { var port = host.GetPort(); using (var socket = CreateSocket(port)) @@ -278,6 +279,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // Dispose host prior to closing connection to verify the server doesn't throw during shutdown // if a connection no longer has alloc and read callbacks configured. + await host.StopAsync(); host.Dispose(); } } @@ -287,7 +289,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await memoryPoolFactory.WhenAllBlocksReturned(TestConstants.DefaultTimeout); } - private IWebHost StartWebHost(long? maxRequestBufferSize, + private async Task StartWebHost(long? maxRequestBufferSize, byte[] expectedBody, bool useConnectionAdapter, TaskCompletionSource startReadingRequestBody, @@ -350,7 +352,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests })) .Build(); - host.Start(); + await host.StartAsync(); return host; } diff --git a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs index 18063f6cfe..46d722aec9 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs @@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = builder.Build()) { - host.Start(); + await host.StartAsync(); using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { @@ -123,6 +123,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await AssertStreamContains(stream, $"bytesRead: {contentLength}"); } } + + await host.StopAsync(); } } @@ -157,13 +159,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = builder.Build()) using (var client = new HttpClient()) { - host.Start(); + await host.StartAsync(); client.DefaultRequestHeaders.Connection.Clear(); client.DefaultRequestHeaders.Connection.Add("close"); var response = await client.GetAsync($"http://127.0.0.1:{host.GetPort()}/"); response.EnsureSuccessStatusCode(); + + await host.StopAsync(); } } @@ -210,6 +214,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -220,7 +225,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var connectionReset = new SemaphoreSlim(0); var loggedHigherThanDebug = false; - TestSink.MessageLogged += context => { + TestSink.MessageLogged += context => + { if (context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel" && context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" && context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets") @@ -258,6 +264,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // is still in flight when the connection is aborted, leading to the reset never being received // and therefore not logged. Assert.True(await connectionReset.WaitAsync(TestConstants.DefaultTimeout)); + + await server.StopAsync(); } Assert.False(loggedHigherThanDebug); @@ -269,7 +277,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var connectionReset = new SemaphoreSlim(0); var loggedHigherThanDebug = false; - TestSink.MessageLogged += context => { + TestSink.MessageLogged += context => + { if (context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel" && context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" && context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets") @@ -316,6 +325,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // is still in flight when the connection is aborted, leading to the reset never being received // and therefore not logged. Assert.True(await connectionReset.WaitAsync(TestConstants.DefaultTimeout)); + await server.StopAsync(); } Assert.False(loggedHigherThanDebug); @@ -329,7 +339,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var connectionClosing = new SemaphoreSlim(0); var loggedHigherThanDebug = false; - TestSink.MessageLogged += context => { + TestSink.MessageLogged += context => + { if (context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel" && context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" && context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets") @@ -371,6 +382,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // and therefore not logged. Assert.True(await connectionReset.WaitAsync(TestConstants.DefaultTimeout), "Connection reset event should have been logged"); connectionClosing.Release(); + await server.StopAsync(); } Assert.False(loggedHigherThanDebug, "Logged event should not have been higher than debug."); @@ -407,7 +419,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = builder.Build()) { - host.Start(); + await host.StartAsync(); using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { @@ -421,6 +433,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.True(await appDone.WaitAsync(_semaphoreWaitTimeout)); Assert.True(expectedExceptionThrown); + + await host.StopAsync(); } } @@ -444,7 +458,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = builder.Build()) { - host.Start(); + await host.StartAsync(); using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { @@ -454,11 +468,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests socket.Shutdown(SocketShutdown.Send); await requestAborted.WaitAsync().DefaultTimeout(); } + + await host.StopAsync(); } } [Fact] - public void AbortingTheConnectionSendsFIN() + public async Task AbortingTheConnectionSendsFIN() { var builder = TransportSelector.GetWebHostBuilder() .UseKestrel() @@ -472,7 +488,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = builder.Build()) { - host.Start(); + await host.StartAsync(); using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { @@ -481,6 +497,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests int result = socket.Receive(new byte[32]); Assert.Equal(0, result); } + + await host.StopAsync(); } } @@ -516,6 +534,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await connectionClosedTcs.Task.DefaultTimeout(); } + await server.StopAsync(); } } @@ -552,6 +571,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests "", ""); } + await server.StopAsync(); } } @@ -593,6 +613,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // isn't guaranteed but not unexpected. } } + await server.StopAsync(); } } @@ -673,6 +694,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests ""); await connection.WaitForConnectionClose(); } + await server.StopAsync(); } await Assert.ThrowsAsync(async () => await readTcs.Task); @@ -698,7 +720,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var serverClosedConnection = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var appFuncCompleted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - TestSink.MessageLogged += context => { + TestSink.MessageLogged += context => + { if (context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" && context.LoggerName != "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets") { @@ -760,6 +783,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests clientClosedConnection.SetResult(null); await appFuncCompleted.Task.DefaultTimeout(); + await server.StopAsync(); } mockKestrelTrace.Verify(t => t.ConnectionStop(It.IsAny()), Times.Once()); @@ -783,7 +807,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests try { - await context.Request.Body.CopyToAsync(Stream.Null);; + await context.Request.Body.CopyToAsync(Stream.Null); ; } catch (Exception ex) { @@ -812,6 +836,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } await Assert.ThrowsAnyAsync(() => readTcs.Task).DefaultTimeout(); + await server.StopAsync(); } mockKestrelTrace.Verify(t => t.ConnectionStop(It.IsAny()), Times.Once()); @@ -841,7 +866,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = builder.Build()) using (var client = new HttpClient()) { - host.Start(); + await host.StartAsync(); var response = await client.GetAsync($"http://{requestAddress}:{host.GetPort()}/"); response.EnsureSuccessStatusCode(); @@ -852,6 +877,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var facts = JsonConvert.DeserializeObject(connectionFacts); Assert.Equal(expectAddress, facts["RemoteIPAddress"].Value()); Assert.NotEmpty(facts["RemotePort"].Value()); + + await host.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs b/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs index 40f1ba8b6b..9172a73506 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs @@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); using (var client = new HttpClient()) { @@ -91,6 +91,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests count = await responseBody.ReadAsync(bytes, 0, bytes.Length); } } + await host.StopAsync(); } } @@ -113,7 +114,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests using (var host = hostBuilder.Build()) { - host.Start(); + await host.StartAsync(); using (var client = new HttpClient()) { @@ -132,6 +133,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.Equal(headers.GetValues(headerName).Single(), expectedValue); } } + await host.StopAsync(); } } @@ -175,6 +177,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests connectionClosed.SetResult(null); await appCompleted.Task.DefaultTimeout(); + await server.StopAsync(); } } @@ -238,6 +241,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // RequestAborted tripped await requestAbortedWh.Task.DefaultTimeout(); + await server.StopAsync(); } } @@ -328,6 +332,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests clientClosedConnection.SetResult(null); await Assert.ThrowsAnyAsync(() => writeTcs.Task).DefaultTimeout(); + await server.StopAsync(); } mockKestrelTrace.Verify(t => t.ConnectionStop(It.IsAny()), Times.Once()); @@ -394,6 +399,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests // On macOS, the default 5 shutdown timeout is insufficient for the write loop to complete, so give it extra time. await appCompletedTcs.Task.DefaultTimeout(); + await server.StopAsync(); } var coreLogs = TestSink.Writes.Where(w => w.LoggerName == "Microsoft.AspNetCore.Server.Kestrel"); @@ -430,6 +436,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests connection.Reset(); } } + await server.StopAsync(); } var transportLogs = TestSink.Writes.Where(w => w.LoggerName == "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" || @@ -539,6 +546,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests sw.Stop(); logger.LogInformation("Connection was aborted after {totalMilliseconds}ms.", sw.ElapsedMilliseconds); } + await server.StopAsync(); } } @@ -629,6 +637,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await AssertStreamAborted(connection.Stream, chunkSize * chunks); } } + await server.StopAsync(); } } @@ -722,6 +731,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await Assert.ThrowsAnyAsync(() => copyToAsyncCts.Task).DefaultTimeout(); await AssertStreamAborted(connection.Stream, responseSize); } + await server.StopAsync(); } } @@ -785,6 +795,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await AssertStreamCompleted(connection.Stream, minTotalOutputSize, targetBytesPerSecond); await appFuncCompleted.Task.DefaultTimeout(); } + await server.StopAsync(); } mockKestrelTrace.Verify(t => t.ResponseMinimumDataRateNotSatisfied(It.IsAny(), It.IsAny()), Times.Never()); @@ -867,6 +878,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests var targetBytesPerSecond = responseSize / 4; await AssertStreamCompleted(connection.Stream, minTotalOutputSize, targetBytesPerSecond); } + await server.StopAsync(); } mockKestrelTrace.Verify(t => t.ResponseMinimumDataRateNotSatisfied(It.IsAny(), It.IsAny()), Times.Never()); diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs index 4c8551899c..64710cc3ed 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs @@ -100,6 +100,8 @@ namespace Interop.FunctionalTests var chromeOutput = RunHeadlessChrome($"https://localhost:{host.GetPort()}/{requestSuffix}"); AssertExpectedResponseOrShowDebugInstructions(expectedResponse, chromeOutput); + + await host.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs index 84bd29b3d0..f0c3b3de00 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs @@ -47,6 +47,8 @@ namespace Interop.FunctionalTests await host.StartAsync(); H2SpecCommands.RunTest(testCase.Id, host.GetPort(), testCase.Https, Logger); + + await host.StopAsync(); } } diff --git a/src/Servers/Kestrel/test/Libuv.FunctionalTests/ListenHandleTests.cs b/src/Servers/Kestrel/test/Libuv.FunctionalTests/ListenHandleTests.cs index 2b204cdfa0..4d3790e049 100644 --- a/src/Servers/Kestrel/test/Libuv.FunctionalTests/ListenHandleTests.cs +++ b/src/Servers/Kestrel/test/Libuv.FunctionalTests/ListenHandleTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Net; @@ -41,6 +41,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests "", ""); } + await server.StopAsync(); } } } From 4816bdcaadd10b5c85a3241abf1b1cdd8f84e180 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sun, 30 Dec 2018 11:19:05 -0400 Subject: [PATCH 31/80] Replace .Wait with await (#6191) --- src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs b/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs index d60303d625..f5baf45f12 100644 --- a/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs +++ b/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs @@ -536,7 +536,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests } [Fact] - public void ProcessRequestsAsyncEnablesKeepAliveTimeout() + public async Task ProcessRequestsAsyncEnablesKeepAliveTimeout() { var requestProcessingTask = _http1Connection.ProcessRequestsAsync(null); @@ -546,7 +546,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests _http1Connection.StopProcessingNextRequest(); _application.Output.Complete(); - requestProcessingTask.Wait(); + await requestProcessingTask.DefaultTimeout(); } [Fact] From 2b7a3a222af721a8b6ab1cbe6a40594a4270a3d8 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 31 Dec 2018 10:54:15 -0800 Subject: [PATCH 32/80] Build Windows Installers using the repo's main build script and repotasks (#6139) Follow-up to #6078 This should solve race conditions in restoring .wixproj files. Co-authored-by: Nate McMaster Co-authored-by: Justin Kotalik --- Directory.Build.props | 11 +++++ build.ps1 | 8 +++- build/repo.props | 29 +++++++++++ .../tasks}/GenerateGuid.cs | 0 .../tasks}/GetMsiProperty.cs | 2 + build/tasks/RepoTasks.csproj | 12 +++++ build/tasks/RepoTasks.tasks | 2 + .../InstallerTasks => build/tasks}/Uuid.cs | 0 eng/scripts/common.psm1 | 48 ------------------- eng/targets/Wix.Common.props | 2 +- eng/targets/Wix.Common.targets | 1 - src/Framework/pkg/Metapackage.targets | 2 - src/Framework/src/SharedFx.targets | 2 - .../ANCMPackageResolver.csproj | 14 +++--- .../Directory.Build.props | 3 ++ src/Installers/Windows/Directory.Build.props | 9 +--- .../Windows/Directory.Build.targets | 2 +- .../InstallerTasks/InstallerTasks.csproj | 23 --------- src/Installers/Windows/Installers.sln | 14 ------ .../WindowsHostingBundle/Product.targets | 6 +-- src/Installers/Windows/WindowsInstallers.proj | 45 ----------------- src/Installers/Windows/Wix.targets | 2 - src/Installers/Windows/build.ps1 | 42 +++------------- src/SiteExtensions/Directory.Build.props | 9 ++-- .../LoggingBranch/Directory.Build.targets | 2 - .../Runtime/Directory.Build.targets | 2 - ...t.AspNetCore.Runtime.SiteExtension.pkgproj | 2 +- src/Tools/Directory.Build.props | 7 ++- 28 files changed, 92 insertions(+), 209 deletions(-) rename {src/Installers/Windows/InstallerTasks => build/tasks}/GenerateGuid.cs (100%) rename {src/Installers/Windows/InstallerTasks => build/tasks}/GetMsiProperty.cs (97%) rename {src/Installers/Windows/InstallerTasks => build/tasks}/Uuid.cs (100%) delete mode 100644 src/Installers/Windows/InstallerTasks/InstallerTasks.csproj delete mode 100644 src/Installers/Windows/WindowsInstallers.proj diff --git a/Directory.Build.props b/Directory.Build.props index 43fb9fcfd1..e255df9e9a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -87,6 +87,15 @@ $(ArtifactsConfigurationDir)installers\ + + $(RepositoryRoot)bin\$(Configuration)\$(MSBuildProjectName)\ + $(BaseOutputPath) + $(RepositoryRoot)obj\$(MSBuildProjectName)\ + $(BaseIntermediateOutputPath)$(Configuration)\ + $(OutputPath)$(Platform)\ + $(IntermediateOutputPath)$(Platform)\ + + $([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectDirectory))) @@ -97,6 +106,8 @@ true + + diff --git a/build.ps1 b/build.ps1 index 3214fbf70b..cf66e3eacd 100644 --- a/build.ps1 +++ b/build.ps1 @@ -45,6 +45,9 @@ Build native projects (C++). .PARAMETER NodeJS Build NodeJS projects (TypeScript, JS). +.PARAMETER Installers +Build Windows Installers. Required .NET 3.5 to be installed (WiX toolset requirement). + .PARAMETER MSBuildArguments Additional MSBuild arguments to be passed through. @@ -96,6 +99,8 @@ param( [switch]$Native, [Parameter(ParameterSetName = 'Groups')] [switch]$NodeJS, + [Parameter(ParameterSetName = 'Groups')] + [switch]$Installers, # Other lifecycle targets [switch]$Help, # Show help @@ -236,7 +241,7 @@ elseif ($Projects) { } else { # When adding new sub-group build flags, add them to this check. - if((-not $Native) -and (-not $Managed) -and (-not $NodeJS)) { + if((-not $Native) -and (-not $Managed) -and (-not $NodeJS) -and (-not $Installers)) { Write-Warning "No default group of projects was specified, so building the 'managed' subset of projects. Run ``build.cmd -help`` for more details." # This goal of this is to pick a sensible default for `build.cmd` with zero arguments. @@ -248,6 +253,7 @@ else { $MSBuildArguments += "/p:BuildManaged=$Managed" $MSBuildArguments += "/p:BuildNative=$Native" $MSBuildArguments += "/p:BuildNodeJS=$NodeJS" + $MSBuildArguments += "/p:BuildWindowsInstallers=$Installers" } # Target selection diff --git a/build/repo.props b/build/repo.props index 798b27743e..10d5859796 100644 --- a/build/repo.props +++ b/build/repo.props @@ -64,6 +64,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Installers/Windows/InstallerTasks/GenerateGuid.cs b/build/tasks/GenerateGuid.cs similarity index 100% rename from src/Installers/Windows/InstallerTasks/GenerateGuid.cs rename to build/tasks/GenerateGuid.cs diff --git a/src/Installers/Windows/InstallerTasks/GetMsiProperty.cs b/build/tasks/GetMsiProperty.cs similarity index 97% rename from src/Installers/Windows/InstallerTasks/GetMsiProperty.cs rename to build/tasks/GetMsiProperty.cs index 90f3cd3d24..182a5f0af3 100644 --- a/src/Installers/Windows/InstallerTasks/GetMsiProperty.cs +++ b/build/tasks/GetMsiProperty.cs @@ -1,3 +1,4 @@ +#if BUILD_MSI_TASKS // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. @@ -36,3 +37,4 @@ namespace RepoTasks } } } +#endif diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 17c9981497..f0b7d88273 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -4,6 +4,7 @@ netcoreapp2.1 net461 + $(DefineConstants);BUILD_MSI_TASKS @@ -13,5 +14,16 @@ + + + + + $(WiXSdkPath)\Microsoft.Deployment.WindowsInstaller.dll + + + $(WiXSdkPath)\Microsoft.Deployment.WindowsInstaller.Package.dll + + + diff --git a/build/tasks/RepoTasks.tasks b/build/tasks/RepoTasks.tasks index c99d93e1c3..17919c3e90 100644 --- a/build/tasks/RepoTasks.tasks +++ b/build/tasks/RepoTasks.tasks @@ -4,6 +4,8 @@ + + diff --git a/src/Installers/Windows/InstallerTasks/Uuid.cs b/build/tasks/Uuid.cs similarity index 100% rename from src/Installers/Windows/InstallerTasks/Uuid.cs rename to build/tasks/Uuid.cs diff --git a/eng/scripts/common.psm1 b/eng/scripts/common.psm1 index 3a31f2a023..96544dc6f2 100644 --- a/eng/scripts/common.psm1 +++ b/eng/scripts/common.psm1 @@ -52,54 +52,6 @@ function LoadXml([string]$path) { return $obj } -function Get-MSBuildPath { - param( - [switch]$Prerelease, - [string[]]$Requires - ) - - $vsInstallDir = $null - if ($env:VSINSTALLDIR -and (Test-Path $env:VSINSTALLDIR)) { - $vsInstallDir = $env:VSINSTALLDIR - Write-Verbose "Using VSINSTALLDIR=$vsInstallDir" - } - else { - $vswhere = "${env:ProgramFiles(x86)}/Microsoft Visual Studio/Installer/vswhere.exe" - Write-Verbose "Using vswhere.exe from $vswhere" - - if (-not (Test-Path $vswhere)) { - Write-Error "Missing prerequisite: could not find vswhere" - } - - [string[]] $vswhereArgs = @() - - if ($Prerelease) { - $vswhereArgs += '-prerelease' - } - - if ($Requires) { - foreach ($r in $Requires) { - $vswhereArgs += '-requires', $r - } - } - - $installs = & $vswhere -format json -version '[15.0, 16.0)' -latest -products * @vswhereArgs | ConvertFrom-Json - if (!$installs) { - Write-Error "Missing prerequisite: could not find any installations of Visual Studio" - } - - $vs = $installs | Select-Object -First 1 - $vsInstallDir = $vs.installationPath - Write-Host "Using $($vs.displayName)" - } - - $msbuild = Join-Path $vsInstallDir 'MSBuild/15.0/bin/msbuild.exe' - if (!(Test-Path $msbuild)) { - Write-Error "Missing prerequisite: could not find msbuild.exe" - } - return $msbuild -} - function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) { if ($RemotePath -notlike 'http*') { Copy-Item $RemotePath $LocalPath diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index 47e291d5b8..9875352599 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -12,7 +12,7 @@ net461 $(BaseIntermediateOutputPath) $(MSBuildProjectDir)\obj\ - + $(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets $(MSBuildToolsPath)\NuGet.targets diff --git a/eng/targets/Wix.Common.targets b/eng/targets/Wix.Common.targets index 3cdb0c3b86..7ff9e39fd6 100644 --- a/eng/targets/Wix.Common.targets +++ b/eng/targets/Wix.Common.targets @@ -41,5 +41,4 @@ - diff --git a/src/Framework/pkg/Metapackage.targets b/src/Framework/pkg/Metapackage.targets index 365eacc8fa..6307d33621 100644 --- a/src/Framework/pkg/Metapackage.targets +++ b/src/Framework/pkg/Metapackage.targets @@ -38,8 +38,6 @@ - - diff --git a/src/Framework/src/SharedFx.targets b/src/Framework/src/SharedFx.targets index 17c1ddc1b2..9027f74b31 100644 --- a/src/Framework/src/SharedFx.targets +++ b/src/Framework/src/SharedFx.targets @@ -4,8 +4,6 @@ This targets file should only be imported by .shfxproj files. --> - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj index c585d69ae2..16cace9755 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj @@ -1,4 +1,6 @@ - + + + netstandard1.0 true @@ -14,14 +16,10 @@ - $(RepositoryRoot).deps\ANCM; - - $(RestoreSources); - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - https://api.nuget.org/v3/index.json; - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; + $(RepositoryRoot).deps\ANCM; - + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props index 4b9d69aa1d..ada3840cee 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props @@ -3,6 +3,9 @@ + $(PackageVersion) + $(PackageVersion) + <_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000)) <_ThreeDigitDayOfYear>$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, '0')) diff --git a/src/Installers/Windows/Directory.Build.props b/src/Installers/Windows/Directory.Build.props index 6a33e27c7d..641ea3aa93 100644 --- a/src/Installers/Windows/Directory.Build.props +++ b/src/Installers/Windows/Directory.Build.props @@ -1,13 +1,8 @@ - $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)..\..\..\')) - $(RepositoryRoot)artifacts\$(Configuration)\installers\ - $(RepositoryRoot)bin\$(Configuration)\$(MSBuildProjectName)\ - $(BaseOutputPath) - $(RepositoryRoot)obj\$(MSBuildProjectName)\ - $(BaseIntermediateOutputPath)$(Configuration)\ - $(IntermediateOutputPath)$(Platform)\ + true + true diff --git a/src/Installers/Windows/Directory.Build.targets b/src/Installers/Windows/Directory.Build.targets index 8dc63cace9..b5cebea51b 100644 --- a/src/Installers/Windows/Directory.Build.targets +++ b/src/Installers/Windows/Directory.Build.targets @@ -1,4 +1,4 @@ - + diff --git a/src/Installers/Windows/InstallerTasks/InstallerTasks.csproj b/src/Installers/Windows/InstallerTasks/InstallerTasks.csproj deleted file mode 100644 index a6d3ce18f1..0000000000 --- a/src/Installers/Windows/InstallerTasks/InstallerTasks.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net461 - false - false - - - - - - - - - - $(WiXSdkPath)\Microsoft.Deployment.WindowsInstaller.dll - - - $(WiXSdkPath)\Microsoft.Deployment.WindowsInstaller.Package.dll - - - - diff --git a/src/Installers/Windows/Installers.sln b/src/Installers/Windows/Installers.sln index 0572e5d0ee..b34c18e8de 100644 --- a/src/Installers/Windows/Installers.sln +++ b/src/Installers/Windows/Installers.sln @@ -25,8 +25,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WindowsHostingBundle", "Win EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFramework", "SharedFramework\SharedFramework.wixproj", "{C681D730-4505-42C6-9E6C-87F757C4FB32}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InstallerTasks", "InstallerTasks\InstallerTasks.csproj", "{D58277B2-4C1F-46D6-B9E1-845C711E3B55}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -131,18 +129,6 @@ Global {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x64.ActiveCfg = Release|x86 {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x86.ActiveCfg = Release|x86 {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x86.Build.0 = Release|x86 - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|x64.ActiveCfg = Debug|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|x64.Build.0 = Debug|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|x86.ActiveCfg = Debug|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|x86.Build.0 = Debug|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|Any CPU.Build.0 = Release|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|x64.ActiveCfg = Release|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|x64.Build.0 = Release|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|x86.ActiveCfg = Release|Any CPU - {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index c91339b2c9..36f4cb8cd9 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -19,7 +19,7 @@ - + https://dotnetcli.azureedge.net/dotnet/ $(DotNetAssetRootUrl)/ @@ -40,9 +40,7 @@ SourceUrl="%(RemoteAsset.Identity)" DestinationFolder="$(DepsPath)" DestinationFileName="%(RemoteAsset.TargetFileName)" /> - - - + diff --git a/src/Installers/Windows/WindowsInstallers.proj b/src/Installers/Windows/WindowsInstallers.proj deleted file mode 100644 index 5337f23dba..0000000000 --- a/src/Installers/Windows/WindowsInstallers.proj +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index d4504f10c3..1ceda1d5a5 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -10,8 +10,6 @@ $(GuidInputs);$(BuildNumberSuffix) - - diff --git a/src/Installers/Windows/build.ps1 b/src/Installers/Windows/build.ps1 index 5b64363f40..252e850d37 100644 --- a/src/Installers/Windows/build.ps1 +++ b/src/Installers/Windows/build.ps1 @@ -1,7 +1,3 @@ -# -# This script requires internal-only access to the code which generates ANCM installers. -# - #requires -version 5 [cmdletbinding()] param( @@ -14,20 +10,20 @@ param( [string]$Runtime64Zip, [string]$BuildNumber = 't000', [switch]$IsFinalBuild, - [string]$SignType = '', - [switch]$clean + [string]$SignType = '' ) $ErrorActionPreference = 'Stop' $repoRoot = Resolve-Path "$PSScriptRoot/../../../" Import-Module -Scope Local "$repoRoot/eng/scripts/common.psm1" -Force -$msbuild = Get-MSBuildPath -Prerelease -requires 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64' $harvestRoot = "$repoRoot/obj/sfx/" if ($clean) { Remove-Item -Recurse -Force $harvestRoot -ErrorAction Ignore | Out-Null } +# TODO: harvest shared frameworks from a project reference + New-Item "$harvestRoot/x86", "$harvestRoot/x64" -ItemType Directory -ErrorAction Ignore | Out-Null if (-not (Test-Path "$harvestRoot/x86/shared/")) { @@ -40,40 +36,14 @@ if (-not (Test-Path "$harvestRoot/x64/shared/")) { Push-Location $PSScriptRoot try { - Invoke-Block { & $msbuild ` - InstallerTasks/InstallerTasks.csproj ` - -nologo ` - -m ` - -v:m ` - -nodeReuse:false ` - -restore ` - -t:Build ` - "-p:Configuration=$Configuration" - } - - [string[]] $msbuildArgs = @() - - if ($clean) { - $msbuildArgs += '-t:Clean' - } - - Invoke-Block { & $msbuild ` - WindowsInstallers.proj ` - -restore ` - -nologo ` - -m ` - -v:m ` - -nodeReuse:false ` - -clp:Summary ` + & $repoRoot/build.ps1 ` + -Installers ` "-p:SharedFrameworkHarvestRootPath=$repoRoot/obj/sfx/" ` "-p:Configuration=$Configuration" ` "-p:BuildNumberSuffix=$BuildNumber" ` "-p:SignType=$SignType" ` "-p:IsFinalBuild=$IsFinalBuild" ` - "-bl:$repoRoot/artifacts/logs/installers.msbuild.binlog" ` - '-t:Build' ` - @msbuildArgs - } + "-bl:$repoRoot/artifacts/logs/installers.msbuild.binlog" } finally { Pop-Location diff --git a/src/SiteExtensions/Directory.Build.props b/src/SiteExtensions/Directory.Build.props index 51a165b974..574418ea36 100644 --- a/src/SiteExtensions/Directory.Build.props +++ b/src/SiteExtensions/Directory.Build.props @@ -1,8 +1,7 @@ - - - $(RepositoryRoot)obj\$(MSBuildProjectName)\ - $(RepositoryRoot)bin\$(MSBuildProjectName)\ + true - \ No newline at end of file + + + diff --git a/src/SiteExtensions/LoggingBranch/Directory.Build.targets b/src/SiteExtensions/LoggingBranch/Directory.Build.targets index 920f1867f5..df33ae31f1 100644 --- a/src/SiteExtensions/LoggingBranch/Directory.Build.targets +++ b/src/SiteExtensions/LoggingBranch/Directory.Build.targets @@ -30,6 +30,4 @@ - - diff --git a/src/SiteExtensions/Runtime/Directory.Build.targets b/src/SiteExtensions/Runtime/Directory.Build.targets index 7e0b4cf398..661159ab76 100644 --- a/src/SiteExtensions/Runtime/Directory.Build.targets +++ b/src/SiteExtensions/Runtime/Directory.Build.targets @@ -30,8 +30,6 @@ - - diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj index 758794431b..fb9cd35046 100644 --- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj +++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj @@ -19,7 +19,7 @@ - + diff --git a/src/Tools/Directory.Build.props b/src/Tools/Directory.Build.props index 0cbe48018a..b4dcdb53d4 100644 --- a/src/Tools/Directory.Build.props +++ b/src/Tools/Directory.Build.props @@ -1,10 +1,9 @@ - - - $(RepositoryRoot)obj\$(MSBuildProjectName)\ - $(RepositoryRoot)bin\$(MSBuildProjectName)\ + true $(MSBuildThisFileDirectory)Shared\ + + From 6dcb847edfebbad165bb700fa1785ea4742fdbf5 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 28 Dec 2018 11:45:58 -0800 Subject: [PATCH 33/80] Reference testsite.props in test asset (#6138) --- .../CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj b/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj index 1d4a68ab59..f22a82fdd8 100644 --- a/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj +++ b/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj @@ -1,5 +1,7 @@  + + Exe netcoreapp2.2 From 08dd1cd0eaefa5cef279ab3de5390eebf9fce241 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 31 Dec 2018 15:51:13 -0800 Subject: [PATCH 34/80] Fix build.cmd/sh for src/Mvc (#6208) --- src/Mvc/build.cmd | 4 ++-- src/Mvc/build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/Mvc/build.sh diff --git a/src/Mvc/build.cmd b/src/Mvc/build.cmd index e5b3c66518..033fe6f614 100644 --- a/src/Mvc/build.cmd +++ b/src/Mvc/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF -SET RepoRoot="%~dp0..\.." -%RepoRoot%\build.cmd -All -RepoRoot %~dp0 %* \ No newline at end of file +SET RepoRoot=%~dp0..\.. +%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* diff --git a/src/Mvc/build.sh b/src/Mvc/build.sh old mode 100644 new mode 100755 index 40bec9e64b..7046bb98a0 --- a/src/Mvc/build.sh +++ b/src/Mvc/build.sh @@ -4,4 +4,4 @@ set -euo pipefail DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" repo_root="$DIR/../.." -"$repo_root/build.sh" -All -RepoRoot "$DIR" "$@" \ No newline at end of file +"$repo_root/build.sh" --projects "$DIR/**/*.*proj" "$@" From 02a8afea3d18791d5f4792be4b3f19eea6f38791 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 31 Dec 2018 16:35:35 -0800 Subject: [PATCH 35/80] Include dependencies in Mvc.sln --- src/Mvc/Mvc.sln | 668 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 665 insertions(+), 3 deletions(-) diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln index c272a47eac..4b1403c16c 100644 --- a/src/Mvc/Mvc.sln +++ b/src/Mvc/Mvc.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28414.68 MinimumVisualStudioVersion = 15.0.26730.03 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" EndProject @@ -178,7 +178,97 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetDocumentInsider", "src\G EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Design", "src\Microsoft.Extensions.ApiDescription.Design\Microsoft.Extensions.ApiDescription.Design.csproj", "{34E3C302-B767-40C8-B538-3EE2BD4000C4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Mvc.Performance.Views", "benchmarks\Microsoft.AspNetCore.Mvc.Performance.Views\Microsoft.AspNetCore.Mvc.Performance.Views.csproj", "{0CA44B59-6538-4668-BB5E-D586946426F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance.Views", "benchmarks\Microsoft.AspNetCore.Mvc.Performance.Views\Microsoft.AspNetCore.Mvc.Performance.Views.csproj", "{0CA44B59-6538-4668-BB5E-D586946426F3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPatch", "..\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj", "{0F41EB10-BD4E-443C-868B-95109F0843E0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization", "..\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj", "{68C06221-185E-41E3-B2C8-B4A1B3D20631}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "..\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{AFA70552-7405-4655-8899-FED6B5F393BD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "..\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{47F3C605-0674-4943-A378-45B4A54B5F14}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "..\Antiforgery\src\Microsoft.AspNetCore.Antiforgery.csproj", "{9C584DF9-CDF2-4522-A0A5-55AAE36820EC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions", "..\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj", "{CFEFED8B-D109-4628-BE40-B02A3A659AB0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "..\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj", "{C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "..\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj", "{5C838817-4DEC-4BA0-BACC-2F512B8245AC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions", "..\Http\Http.Extensions\src\Microsoft.AspNetCore.Http.Extensions.csproj", "{0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "..\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{A04124E5-E4AA-4311-8049-DAF371871B31}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "..\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj", "{A6018CDE-37DD-4317-80EB-01DB306EA5B9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{B3AE9A77-1198-4974-AA78-531CE6C568F3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Core", "..\Http\Authentication.Core\src\Microsoft.AspNetCore.Authentication.Core.csproj", "{F95DC77B-CA52-4BBB-817E-79ABFE330C5C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "..\Http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{1024A6BE-E0AF-4170-B61D-E6C092780195}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{0F04DD66-08B7-47F4-9826-66CD8FD539FF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{9328599D-A7AF-43BC-BE08-7503DF9B8CE6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "..\Hosting\Server.Abstractions\src\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", "{CC2FF678-438C-4343-A1A7-BF3E75470EB9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions", "..\Http\Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj", "{8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{AED237FC-AB90-4C0F-88C2-C20964D7651E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{C185A2B1-64C0-491B-9AAE-382C24F9B4AE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{B37FF37D-0A47-494A-B5ED-497F273B9067}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{22F657F5-7D95-438A-985A-A390938E7843}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{731B64B8-AB91-4A05-AE5C-929996D58A52}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{2D665D68-BF48-41E0-B74C-A88A83F8AFD5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "..\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{E07090BD-05AF-4DC0-9D59-35EF70EBC764}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.JwtBearer", "..\Security\Authentication\JwtBearer\src\Microsoft.AspNetCore.Authentication.JwtBearer.csproj", "{22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "..\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj", "{E335D925-771A-4FB9-A94C-1D74A8F01DCE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{FF88FB5E-0096-4096-A0D7-FCFE5D55F164}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization.Routing", "..\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj", "{4D04F472-8E7C-487D-8B57-9533B1F7F3DE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{7DBA484B-BA85-4768-9002-68F49C2D9A86}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Abstractions", "..\Http\Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "{60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features", "..\Http\Http.Features\src\Microsoft.AspNetCore.Http.Features.csproj", "{C72560B4-C9AC-49EA-B202-89BCD3826EB8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{47C60935-CF5B-459C-B6C4-760350F3904B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "..\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj", "{12D0BEB8-A1C6-4712-8368-83BC65428CA8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "..\DataProtection\DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{CC355676-B7EF-4A0E-9659-BCB50127E850}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "..\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides", "..\Middleware\HttpOverrides\src\Microsoft.AspNetCore.HttpOverrides.csproj", "{9401F793-F2F3-45C6-8232-EF40700DA0A4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.Internal", "..\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj", "{848E2620-EAF9-4BFD-8810-4AF71E09A8FB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "..\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{C75C6E51-4FFD-4902-8739-9109E51875B4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "..\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj", "{11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -958,6 +1048,534 @@ Global {0CA44B59-6538-4668-BB5E-D586946426F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU {0CA44B59-6538-4668-BB5E-D586946426F3}.Release|x86.ActiveCfg = Release|Any CPU {0CA44B59-6538-4668-BB5E-D586946426F3}.Release|x86.Build.0 = Release|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Debug|x86.ActiveCfg = Debug|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Debug|x86.Build.0 = Debug|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Release|Any CPU.Build.0 = Release|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Release|x86.ActiveCfg = Release|Any CPU + {0F41EB10-BD4E-443C-868B-95109F0843E0}.Release|x86.Build.0 = Release|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Debug|x86.ActiveCfg = Debug|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Debug|x86.Build.0 = Debug|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Release|Any CPU.ActiveCfg = Release|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Release|Any CPU.Build.0 = Release|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Release|x86.ActiveCfg = Release|Any CPU + {68C06221-185E-41E3-B2C8-B4A1B3D20631}.Release|x86.Build.0 = Release|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|x86.ActiveCfg = Debug|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|x86.Build.0 = Debug|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|Any CPU.Build.0 = Release|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|x86.ActiveCfg = Release|Any CPU + {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|x86.Build.0 = Release|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|x86.ActiveCfg = Debug|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|x86.Build.0 = Debug|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|Any CPU.Build.0 = Release|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|x86.ActiveCfg = Release|Any CPU + {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|x86.Build.0 = Release|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Debug|x86.ActiveCfg = Debug|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Debug|x86.Build.0 = Debug|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Release|Any CPU.Build.0 = Release|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Release|x86.ActiveCfg = Release|Any CPU + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Release|x86.Build.0 = Release|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|x86.ActiveCfg = Debug|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|x86.Build.0 = Debug|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|Any CPU.Build.0 = Release|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|x86.ActiveCfg = Release|Any CPU + {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|x86.Build.0 = Release|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Debug|x86.ActiveCfg = Debug|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Debug|x86.Build.0 = Debug|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Release|Any CPU.Build.0 = Release|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Release|x86.ActiveCfg = Release|Any CPU + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Release|x86.Build.0 = Release|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|x86.ActiveCfg = Debug|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|x86.Build.0 = Debug|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|Any CPU.Build.0 = Release|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|x86.ActiveCfg = Release|Any CPU + {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|x86.Build.0 = Release|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|x86.ActiveCfg = Debug|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|x86.Build.0 = Debug|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|Any CPU.Build.0 = Release|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|x86.ActiveCfg = Release|Any CPU + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|x86.Build.0 = Release|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|x86.ActiveCfg = Debug|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|x86.Build.0 = Debug|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|Any CPU.Build.0 = Release|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|x86.ActiveCfg = Release|Any CPU + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|x86.Build.0 = Release|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Debug|x86.ActiveCfg = Debug|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Debug|x86.Build.0 = Debug|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Release|Any CPU.Build.0 = Release|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Release|x86.ActiveCfg = Release|Any CPU + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Release|x86.Build.0 = Release|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Debug|x86.ActiveCfg = Debug|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Debug|x86.Build.0 = Debug|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Release|Any CPU.Build.0 = Release|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Release|x86.ActiveCfg = Release|Any CPU + {A04124E5-E4AA-4311-8049-DAF371871B31}.Release|x86.Build.0 = Release|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|x86.ActiveCfg = Debug|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|x86.Build.0 = Debug|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|Any CPU.Build.0 = Release|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|x86.ActiveCfg = Release|Any CPU + {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|x86.Build.0 = Release|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|x86.ActiveCfg = Debug|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|x86.Build.0 = Debug|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|Any CPU.Build.0 = Release|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|x86.ActiveCfg = Release|Any CPU + {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|x86.Build.0 = Release|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Debug|x86.ActiveCfg = Debug|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Debug|x86.Build.0 = Debug|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Release|Any CPU.Build.0 = Release|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Release|x86.ActiveCfg = Release|Any CPU + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Release|x86.Build.0 = Release|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Debug|x86.ActiveCfg = Debug|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Debug|x86.Build.0 = Debug|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Release|Any CPU.Build.0 = Release|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Release|x86.ActiveCfg = Release|Any CPU + {1024A6BE-E0AF-4170-B61D-E6C092780195}.Release|x86.Build.0 = Release|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|x86.ActiveCfg = Debug|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|x86.Build.0 = Debug|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|Any CPU.Build.0 = Release|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|x86.ActiveCfg = Release|Any CPU + {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|x86.Build.0 = Release|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Debug|x86.ActiveCfg = Debug|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Debug|x86.Build.0 = Debug|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Release|Any CPU.Build.0 = Release|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Release|x86.ActiveCfg = Release|Any CPU + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Release|x86.Build.0 = Release|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Debug|x86.ActiveCfg = Debug|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Debug|x86.Build.0 = Debug|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Release|Any CPU.Build.0 = Release|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Release|x86.ActiveCfg = Release|Any CPU + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Release|x86.Build.0 = Release|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|x86.ActiveCfg = Debug|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|x86.Build.0 = Debug|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|Any CPU.Build.0 = Release|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|x86.ActiveCfg = Release|Any CPU + {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|x86.Build.0 = Release|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Debug|x86.ActiveCfg = Debug|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Debug|x86.Build.0 = Debug|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|Any CPU.Build.0 = Release|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|x86.ActiveCfg = Release|Any CPU + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|x86.Build.0 = Release|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|x86.ActiveCfg = Debug|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|x86.Build.0 = Debug|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|Any CPU.Build.0 = Release|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|x86.ActiveCfg = Release|Any CPU + {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|x86.Build.0 = Release|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|x86.ActiveCfg = Debug|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|x86.Build.0 = Debug|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|Any CPU.Build.0 = Release|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|x86.ActiveCfg = Release|Any CPU + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|x86.Build.0 = Release|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|x86.ActiveCfg = Debug|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|x86.Build.0 = Debug|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|Any CPU.Build.0 = Release|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|x86.ActiveCfg = Release|Any CPU + {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|x86.Build.0 = Release|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Debug|Any CPU.Build.0 = Debug|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Debug|x86.ActiveCfg = Debug|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Debug|x86.Build.0 = Debug|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Release|Any CPU.ActiveCfg = Release|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Release|Any CPU.Build.0 = Release|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Release|x86.ActiveCfg = Release|Any CPU + {22F657F5-7D95-438A-985A-A390938E7843}.Release|x86.Build.0 = Release|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|Any CPU.Build.0 = Debug|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|x86.ActiveCfg = Debug|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|x86.Build.0 = Debug|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|Any CPU.ActiveCfg = Release|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|Any CPU.Build.0 = Release|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|x86.ActiveCfg = Release|Any CPU + {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|x86.Build.0 = Release|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|x86.ActiveCfg = Debug|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|x86.Build.0 = Debug|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|Any CPU.Build.0 = Release|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|x86.ActiveCfg = Release|Any CPU + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|x86.Build.0 = Release|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|x86.ActiveCfg = Debug|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|x86.Build.0 = Debug|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|Any CPU.Build.0 = Release|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|x86.ActiveCfg = Release|Any CPU + {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|x86.Build.0 = Release|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|Any CPU.Build.0 = Debug|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|x86.ActiveCfg = Debug|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|x86.Build.0 = Debug|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|Any CPU.ActiveCfg = Release|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|Any CPU.Build.0 = Release|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|x86.ActiveCfg = Release|Any CPU + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|x86.Build.0 = Release|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|x86.ActiveCfg = Debug|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|x86.Build.0 = Debug|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|Any CPU.Build.0 = Release|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|x86.ActiveCfg = Release|Any CPU + {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|x86.Build.0 = Release|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|x86.ActiveCfg = Debug|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|x86.Build.0 = Debug|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|Any CPU.Build.0 = Release|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|x86.ActiveCfg = Release|Any CPU + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|x86.Build.0 = Release|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|x86.ActiveCfg = Debug|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|x86.Build.0 = Debug|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|Any CPU.Build.0 = Release|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|x86.ActiveCfg = Release|Any CPU + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|x86.Build.0 = Release|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Debug|x86.ActiveCfg = Debug|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Debug|x86.Build.0 = Debug|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Release|Any CPU.Build.0 = Release|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Release|x86.ActiveCfg = Release|Any CPU + {7DBA484B-BA85-4768-9002-68F49C2D9A86}.Release|x86.Build.0 = Release|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Debug|x86.ActiveCfg = Debug|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Debug|x86.Build.0 = Debug|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Release|Any CPU.ActiveCfg = Release|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Release|Any CPU.Build.0 = Release|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Release|x86.ActiveCfg = Release|Any CPU + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}.Release|x86.Build.0 = Release|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Debug|x86.ActiveCfg = Debug|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Debug|x86.Build.0 = Debug|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Release|Any CPU.Build.0 = Release|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Release|x86.ActiveCfg = Release|Any CPU + {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Release|x86.Build.0 = Release|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|x86.ActiveCfg = Debug|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|x86.Build.0 = Debug|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|Any CPU.Build.0 = Release|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|x86.ActiveCfg = Release|Any CPU + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|x86.Build.0 = Release|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|x86.ActiveCfg = Debug|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|x86.Build.0 = Debug|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|Any CPU.Build.0 = Release|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|x86.ActiveCfg = Release|Any CPU + {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|x86.Build.0 = Release|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|x86.ActiveCfg = Debug|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|x86.Build.0 = Debug|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Release|Any CPU.Build.0 = Release|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Release|x86.ActiveCfg = Release|Any CPU + {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Release|x86.Build.0 = Release|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Debug|x86.ActiveCfg = Debug|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Debug|x86.Build.0 = Debug|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Release|Any CPU.Build.0 = Release|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Release|x86.ActiveCfg = Release|Any CPU + {CC355676-B7EF-4A0E-9659-BCB50127E850}.Release|x86.Build.0 = Release|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Debug|x86.ActiveCfg = Debug|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Debug|x86.Build.0 = Debug|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Release|Any CPU.Build.0 = Release|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Release|x86.ActiveCfg = Release|Any CPU + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C}.Release|x86.Build.0 = Release|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Debug|x86.ActiveCfg = Debug|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Debug|x86.Build.0 = Debug|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Release|Any CPU.Build.0 = Release|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Release|x86.ActiveCfg = Release|Any CPU + {9401F793-F2F3-45C6-8232-EF40700DA0A4}.Release|x86.Build.0 = Release|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Debug|x86.ActiveCfg = Debug|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Debug|x86.Build.0 = Debug|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Release|Any CPU.Build.0 = Release|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Release|x86.ActiveCfg = Release|Any CPU + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB}.Release|x86.Build.0 = Release|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Debug|x86.ActiveCfg = Debug|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Debug|x86.Build.0 = Debug|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Release|Any CPU.Build.0 = Release|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Release|x86.ActiveCfg = Release|Any CPU + {C75C6E51-4FFD-4902-8739-9109E51875B4}.Release|x86.Build.0 = Release|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|x86.ActiveCfg = Debug|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|x86.Build.0 = Debug|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|Any CPU.Build.0 = Release|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|x86.ActiveCfg = Release|Any CPU + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1031,6 +1649,50 @@ Global {2F683CF8-B055-46AE-BF83-9D1307F8D45F} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {34E3C302-B767-40C8-B538-3EE2BD4000C4} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {0CA44B59-6538-4668-BB5E-D586946426F3} = {FDC66952-A3EA-4074-899E-C29816BF7C1F} + {0F41EB10-BD4E-443C-868B-95109F0843E0} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {68C06221-185E-41E3-B2C8-B4A1B3D20631} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {AFA70552-7405-4655-8899-FED6B5F393BD} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {47F3C605-0674-4943-A378-45B4A54B5F14} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {9C584DF9-CDF2-4522-A0A5-55AAE36820EC} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {CFEFED8B-D109-4628-BE40-B02A3A659AB0} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {5C838817-4DEC-4BA0-BACC-2F512B8245AC} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {A04124E5-E4AA-4311-8049-DAF371871B31} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {A6018CDE-37DD-4317-80EB-01DB306EA5B9} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {B3AE9A77-1198-4974-AA78-531CE6C568F3} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {F95DC77B-CA52-4BBB-817E-79ABFE330C5C} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {1024A6BE-E0AF-4170-B61D-E6C092780195} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {0F04DD66-08B7-47F4-9826-66CD8FD539FF} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {CC2FF678-438C-4343-A1A7-BF3E75470EB9} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {AED237FC-AB90-4C0F-88C2-C20964D7651E} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {C185A2B1-64C0-491B-9AAE-382C24F9B4AE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {B37FF37D-0A47-494A-B5ED-497F273B9067} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {22F657F5-7D95-438A-985A-A390938E7843} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {731B64B8-AB91-4A05-AE5C-929996D58A52} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {2D665D68-BF48-41E0-B74C-A88A83F8AFD5} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {E07090BD-05AF-4DC0-9D59-35EF70EBC764} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {E335D925-771A-4FB9-A94C-1D74A8F01DCE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {FF88FB5E-0096-4096-A0D7-FCFE5D55F164} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {4D04F472-8E7C-487D-8B57-9533B1F7F3DE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {7DBA484B-BA85-4768-9002-68F49C2D9A86} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {C72560B4-C9AC-49EA-B202-89BCD3826EB8} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {47C60935-CF5B-459C-B6C4-760350F3904B} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {12D0BEB8-A1C6-4712-8368-83BC65428CA8} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {CC355676-B7EF-4A0E-9659-BCB50127E850} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {9401F793-F2F3-45C6-8232-EF40700DA0A4} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {848E2620-EAF9-4BFD-8810-4AF71E09A8FB} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {C75C6E51-4FFD-4902-8739-9109E51875B4} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {63D344F6-F86D-40E6-85B9-0AABBE338C4A} From 8cfa8ea64a6c591463cc25ec7ad9015d48600470 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Thu, 27 Dec 2018 16:38:41 -0800 Subject: [PATCH 36/80] chmod +x on build.sh --- src/Components/build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/Components/build.sh diff --git a/src/Components/build.sh b/src/Components/build.sh old mode 100644 new mode 100755 From 688ab7fc49baeceb903d5d232be1d1d2bc15c55b Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Sat, 29 Dec 2018 17:15:54 -0800 Subject: [PATCH 37/80] Fix dotnet-blazor serve This wasn't properly forwarding the base path to the configuration. Basically nothing was setting RemainingArguments. We have a test project that sets the base path, but it was never used when debugging locally. I also cleaned this up a bit and changed it to use dotnet exec. This allow you to debug the CLI and related server pipeline, but has the tradeoff of not rebuilding. --- ...ft.AspNetCore.Blazor.E2EPerformance.csproj | 4 --- .../StandaloneApp/StandaloneApp.csproj | 4 --- .../Commands/ServeCommand.cs | 27 ++++++++++++----- .../Program.cs | 29 +++++++++++-------- .../ReferenceFromSource.props | 16 +++++++++- .../testapps/BasicTestApp/BasicTestApp.csproj | 5 ++-- 6 files changed, 53 insertions(+), 32 deletions(-) diff --git a/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj b/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj index 7e93b792fb..156441542c 100644 --- a/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj +++ b/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj @@ -2,10 +2,6 @@ netstandard2.0 - - - dotnet - run --project ../../../blazor/src/Microsoft.AspNetCore.Blazor.Cli serve diff --git a/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj b/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj index 82b4494aad..156441542c 100644 --- a/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj +++ b/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj @@ -2,10 +2,6 @@ netstandard2.0 - - - dotnet - run --project ../../src/Microsoft.AspNetCore.Blazor.Cli serve diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Commands/ServeCommand.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Commands/ServeCommand.cs index ce16353a74..ae7a4d671a 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Commands/ServeCommand.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Commands/ServeCommand.cs @@ -3,19 +3,30 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.CommandLineUtils; -using System; -using System.Diagnostics; -using System.Text.RegularExpressions; namespace Microsoft.AspNetCore.Blazor.Cli.Commands { - class ServeCommand + internal class ServeCommand : CommandLineApplication { - public static void Command(CommandLineApplication command) - { - var remainingArgs = command.RemainingArguments.ToArray(); + public ServeCommand(CommandLineApplication parent) - Server.Program.BuildWebHost(remainingArgs).Run(); + // We pass arbitrary arguments through to the ASP.NET Core configuration + : base(throwOnUnexpectedArg: false) + { + Parent = parent; + + Name = "serve"; + Description = "Serve requests to a Blazor application"; + + HelpOption("-?|-h|--help"); + + OnExecute(Execute); + } + + private int Execute() + { + Server.Program.BuildWebHost(RemainingArguments.ToArray()).Run(); + return 0; } } } diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Program.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Program.cs index 288715da4b..dcc71099b1 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Program.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Program.cs @@ -1,11 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Hosting; -using System; -using System.Linq; -using Microsoft.Extensions.CommandLineUtils; using Microsoft.AspNetCore.Blazor.Cli.Commands; +using Microsoft.Extensions.CommandLineUtils; namespace Microsoft.AspNetCore.Blazor.Cli { @@ -13,22 +10,30 @@ namespace Microsoft.AspNetCore.Blazor.Cli { static int Main(string[] args) { - var app = new CommandLineApplication + var app = new CommandLineApplication(throwOnUnexpectedArg: false) { Name = "blazor-cli" }; app.HelpOption("-?|-h|--help"); - app.Command("serve", ServeCommand.Command); + app.Commands.Add(new ServeCommand(app)); - if (args.Length > 0) - { - return app.Execute(args); - } - else + // A command is always required + app.OnExecute(() => { app.ShowHelp(); return 0; + }); + + try + { + return app.Execute(args); + } + catch (CommandParsingException cex) + { + app.Error.WriteLine(cex.Message); + app.ShowHelp(); + return 1; } } } diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props b/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props index f524d0cc37..4fbfbac254 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props @@ -1,4 +1,4 @@ - + + + dotnet + <_BlazorCliLocation>$(MSBuildThisFileDirectory)../../blazor/src/Microsoft.AspNetCore.Blazor.Cli/bin/$(Configuration)/netcoreapp3.0/dotnet-blazor.dll + exec $(_BlazorCliLocation) serve $(AdditionalRunArguments) + + diff --git a/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj index 7651dd7cec..b1fa526fd7 100644 --- a/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj @@ -3,9 +3,8 @@ netstandard2.0 - - dotnet - run --project ../../../blazor/src/Microsoft.AspNetCore.Blazor.Cli serve --pathbase /subdir + + --pathbase /subdir From edc62a0a09c82b03bb6b812a5e6a5abb2837c2b9 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Sat, 29 Dec 2018 13:18:13 -0800 Subject: [PATCH 38/80] Update Razor SDK Version --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 2f31984144..9084ed7da5 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -107,7 +107,7 @@ 3.0.0-preview.18604.3 - 3.0.0-preview.18623.1 + 3.0.0-preview.19051.4 From 4424594c9babfdd093be4436cf7e734d2f87a00e Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Thu, 27 Dec 2018 17:10:32 -0800 Subject: [PATCH 39/80] Allow build to specify Razor SDK version --- .../Microsoft.AspNetCore.Blazor.E2EPerformance.csproj | 4 ++++ .../HostedInAspNet.Client/HostedInAspNet.Client.csproj | 4 ++++ .../HostedInAspNet.Server/HostedInAspNet.Server.csproj | 4 ++++ .../blazor/samples/MonoSanityClient/MonoSanityClient.csproj | 4 ++++ .../blazor/samples/StandaloneApp/StandaloneApp.csproj | 4 ++++ .../samples/ComponentsApp.App/ComponentsApp.App.csproj | 4 ++++ .../ComponentsApp.Server/ComponentsApp.Server.csproj | 4 ++++ .../test/testapps/BasicTestApp/BasicTestApp.csproj | 6 +++++- .../testapps/TestContentPackage/TestContentPackage.csproj | 6 +++++- src/Components/test/testapps/TestServer/TestServer.csproj | 5 +++++ 10 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj b/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj index 156441542c..b59fcb2b3c 100644 --- a/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj +++ b/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/src/Components/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/src/Components/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj index cf91951b81..07f6ccedb7 100644 --- a/src/Components/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj +++ b/src/Components/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj @@ -12,4 +12,8 @@ + + + + diff --git a/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj index 4c59a6d2c8..4fac23c0f5 100644 --- a/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj +++ b/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj @@ -13,4 +13,8 @@ + + + + diff --git a/src/Components/blazor/samples/MonoSanityClient/MonoSanityClient.csproj b/src/Components/blazor/samples/MonoSanityClient/MonoSanityClient.csproj index 72f20a8fc8..f05ca817b0 100644 --- a/src/Components/blazor/samples/MonoSanityClient/MonoSanityClient.csproj +++ b/src/Components/blazor/samples/MonoSanityClient/MonoSanityClient.csproj @@ -13,4 +13,8 @@ + + + + diff --git a/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj b/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj index 156441542c..b59fcb2b3c 100644 --- a/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj +++ b/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj b/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj index 84b3dfdfdc..2f23221fdf 100644 --- a/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj +++ b/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj @@ -13,4 +13,8 @@ + + + + \ No newline at end of file diff --git a/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj b/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj index 53bfabb9f3..97ac921fe4 100644 --- a/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj +++ b/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj @@ -14,4 +14,8 @@ + + + + diff --git a/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj index b1fa526fd7..1d6a19d2cf 100644 --- a/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj @@ -13,5 +13,9 @@ - + + + + + diff --git a/src/Components/test/testapps/TestContentPackage/TestContentPackage.csproj b/src/Components/test/testapps/TestContentPackage/TestContentPackage.csproj index ad01a49160..7740468e59 100644 --- a/src/Components/test/testapps/TestContentPackage/TestContentPackage.csproj +++ b/src/Components/test/testapps/TestContentPackage/TestContentPackage.csproj @@ -12,7 +12,7 @@ - + @@ -24,4 +24,8 @@ + + + + diff --git a/src/Components/test/testapps/TestServer/TestServer.csproj b/src/Components/test/testapps/TestServer/TestServer.csproj index a907580e1d..c30ffa69ea 100644 --- a/src/Components/test/testapps/TestServer/TestServer.csproj +++ b/src/Components/test/testapps/TestServer/TestServer.csproj @@ -15,4 +15,9 @@ + + + + + From 9e89a69a780aecf28f77469b91b464bfe5a8404d Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Thu, 27 Dec 2018 22:08:30 -0800 Subject: [PATCH 40/80] Update RazorCompilation.targets for new SDK --- .../HostedInAspNet.Server.csproj | 13 +- .../samples/MonoSanity/MonoSanity.csproj | 1 - .../ComponentsApp.Server.csproj | 1 - ...crosoft.AspNetCore.Components.Build.csproj | 4 +- .../targets/RazorCompilation.targets | 438 +----------------- ...ft.AspNetCore.Components.Build.Test.csproj | 4 +- .../testapps/TestServer/TestServer.csproj | 1 - 7 files changed, 36 insertions(+), 426 deletions(-) diff --git a/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj index 4fac23c0f5..4a72bd82a7 100644 --- a/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj +++ b/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj @@ -1,7 +1,18 @@ - + netcoreapp3.0 + + + false diff --git a/src/Components/blazor/samples/MonoSanity/MonoSanity.csproj b/src/Components/blazor/samples/MonoSanity/MonoSanity.csproj index 503326e547..266f7976ca 100644 --- a/src/Components/blazor/samples/MonoSanity/MonoSanity.csproj +++ b/src/Components/blazor/samples/MonoSanity/MonoSanity.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj b/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj index 97ac921fe4..40d92c7295 100644 --- a/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj +++ b/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj @@ -6,7 +6,6 @@ - diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj index 322bd288d2..6c244318e0 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.0 Build mechanism for ASP.NET Core Components. Exe true @@ -60,7 +60,7 @@ repositorycommit=$(RepositoryCommit); - <_TargetFramework Include="$(TargetFrameworks)" /> + <_TargetFramework Include="$(TargetFramework)" /> diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets b/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets index 7d06e76551..08386d7de3 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets @@ -1,436 +1,36 @@ + + This file now contains some *very temporary* settings to make projects + that use components use similar defaults to 2.X-based Blazor projects. + --> - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + <_EnableAllInclusiveRazorSdk>true + 3.0 + MVC-3.0 + false + false + false - - - - <_AngleSharpAssemblyPath>$(BlazorToolsDir)AngleSharp.dll - <_BlazorExtensionAssemblyPath>$(BlazorToolsDir)Microsoft.AspNetCore.Components.Razor.Extensions.dll - - - false - - Experimental - - - 0.1 - Blazor-$(BlazorLanguageVersion) - BlazorDeclaration-$(BlazorLanguageVersion) - $(BlazorDefinitionConfiguration) - - - - - <_BlazorGenerateDeclarationContent Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" /> - - MSBuild:BlazorGenerateDeclaration - Never - - - - - - - Blazor-$(BlazorLanguageVersion);Blazor.AngleSharp-$(BlazorLanguageVersion);$(CustomRazorExtension) + + MVC-3.0;$(CustomRazorExtension) - - Blazor-$(BlazorLanguageVersion)Blazor.AngleSharp-$(BlazorLanguageVersion);$(CustomRazorExtension) - - - - AngleSharp - $(_AngleSharpAssemblyPath) + + Microsoft.AspNetCore.Mvc.Razor.Extensions + $(RazorSdkDirectoryRoot)extensions\mvc-3-0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll - - Microsoft.AspNetCore.Components.Razor.Extensions - $(_BlazorExtensionAssemblyPath) - - - - <_BlazorTempAssembly Include="$(IntermediateOutputPath)BlazorTemp\$(TargetName).dll" /> - - - + - - - _DefineBlazorPaths; - _ResolveBlazorInputs; - _AssignBlazorGenerateTargetPaths; - _HashBlazorGenerateInputs; - - - BlazorGenerateDeclaration; - BlazorResolveComponents; - - - - - - - - <_BlazorGenerateDeclarationComponentManifest>$(IntermediateOutputPath)Blazor.declaration.components.json - <_BlazorGenerateDefinitionComponentManifest>$(IntermediateOutputPath)Blazor.definition.components.json - <_BlazorComponentInputCache>$(IntermediateOutputPath)Blazor.components.input.cache - - - - + - + - - - - - - - - - - $(IntermediateOutputPath)$([System.IO.Path]::ChangeExtension('%(BlazorGenerateWithTargetPath.TargetPath)', 'g.i.cs')) - - - $(IntermediateOutputPath)$([System.IO.Path]::ChangeExtension('%(BlazorGenerateWithTargetPath.TargetPath)', 'g.cs')) - - - - - - - %(Identity) - - - - - - - - - - - - <_BlazorGenerateInputsHash> - <_BlazorGenerateInputsHashFile>$(IntermediateOutputPath)Blazor.inputs.txt - - - - - - - - - - - - - - - - - - - - <_BlazorGenerateDeclarationWithTargetPath Include="@(BlazorGenerateWithTargetPath)"> - %(GeneratedDeclaration) - - <_BlazorDeclarationConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(BlazorDeclarationConfiguration)'))" /> - - - - - - - - - - - - - - - - - - - - <_BlazorReferencePathWithRefAssemblies Include="@(ReferencePathWithRefAssemblies)" /> - <_BlazorReferencePathWithRefAssemblies Include="%(_BlazorTempAssembly.FullPath)" Condition="Exists('%(_BlazorTempAssembly.FullPath)')" /> - - - - <_BlazorDeclarationConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(BlazorDeclarationConfiguration)'))" /> - - - - - - - - - - - - - - - - - - - - <_BlazorGenerateDefinitionWithTargetPath Include="@(BlazorGenerateWithTargetPath)"> - %(GeneratedDefinition) - - <_BlazorDefinitionConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(BlazorDefinitionConfiguration)'))" /> - - - - - - - - - - - - - - - - - - - - - - - $(NoWarn);1701;1702 - - - - - $(NoWarn);2008 - - - - - - - - - - - $(AppConfig) - - - - - false - - - - - - - - - - true - - - - - - - - - - - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj index 6999589921..ebeec16b7c 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj +++ b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj @@ -23,12 +23,14 @@ - + + + diff --git a/src/Components/test/testapps/TestServer/TestServer.csproj b/src/Components/test/testapps/TestServer/TestServer.csproj index c30ffa69ea..abce454f2d 100644 --- a/src/Components/test/testapps/TestServer/TestServer.csproj +++ b/src/Components/test/testapps/TestServer/TestServer.csproj @@ -8,7 +8,6 @@ - From bdb5982dbdb0b1bcb87812efdcce401400f93a86 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Sat, 29 Dec 2018 13:22:22 -0800 Subject: [PATCH 41/80] Remove Blazor Compiler --- build/artifacts.props | 1 - src/Components/Components.sln | 133 +- ...rosoft.VisualStudio.BlazorExtension.csproj | 26 +- .../Properties/AssemblyInfo.cs | 15 +- .../source.extension.vsixmanifest | 2 - .../BlazorProjectEngineFactory.cs | 29 - ...isualStudio.LanguageServices.Blazor.csproj | 3 - ...crosoft.AspNetCore.Components.Build.csproj | 10 - ...crosoft.AspNetCore.Components.Build.nuspec | 2 - .../ReferenceFromSource.props | 2 - .../BindLoweringPass.cs | 519 ------- .../BindTagHelperDescriptorProvider.cs | 492 ------- .../BlazorCSharpLoweringPhase.cs | 42 - .../BlazorCodeTarget.cs | 59 - .../BlazorDesignTimeNodeWriter.cs | 775 ---------- .../BlazorDiagnosticFactory.cs | 323 ----- .../BlazorExtensionInitializer.cs | 136 -- .../BlazorImportProjectFeature.cs | 99 -- .../BlazorMetadata.cs | 83 -- .../BlazorNodeWriter.cs | 218 --- .../BlazorRuntimeNodeWriter.cs | 766 ---------- .../BlazorTemplateTargetExtension.cs | 16 - .../CSharpIdentifier.cs | 72 - .../ChildContentDiagnosticPass.cs | 72 - .../CodeWriterExtensions.cs | 647 --------- .../ComplexAttributeContentPass.cs | 107 -- .../ComponentAttributeExtensionNode.cs | 131 -- .../ComponentChildContentIntermediateNode.cs | 52 - .../ComponentDocumentClassifierPass.cs | 208 --- .../ComponentDocumentRewritePass.cs | 533 ------- .../ComponentExtensionNode.cs | 107 -- .../ComponentLoweringPass.cs | 490 ------- .../ComponentTagHelperDescriptorProvider.cs | 505 ------- .../ComponentTypeArgumentExtensionNode.cs | 69 - ...nentTypeInferenceMethodIntermediateNode.cs | 61 - .../DocumentIntermediateNodeExtensions.cs | 44 - .../EliminateMethodBodyPass.cs | 66 - .../EventHandlerLoweringPass.cs | 211 --- ...EventHandlerTagHelperDescriptorProvider.cs | 220 --- .../GenericComponentPass.cs | 305 ---- .../GenericTypeNameRewriter.cs | 62 - .../GlobalQualifiedTypeNameRewriter.cs | 62 - .../HtmlBlockIntermediateNode.cs | 46 - .../HtmlBlockPass.cs | 349 ----- .../HtmlElementIntermediateNode.cs | 91 -- .../ImplementsDirective.cs | 32 - .../ImplementsDirectivePass.cs | 37 - .../InjectDirective.cs | 113 -- .../LayoutDirective.cs | 32 - .../LayoutDirectivePass.cs | 53 - ...NetCore.Components.Razor.Extensions.csproj | 38 - .../PageDirective.cs | 44 - .../PageDirectivePass.cs | 82 -- .../Properties/AssemblyInfo.cs | 13 - .../RazorCompilerException.cs | 29 - .../RefExtensionNode.cs | 67 - .../RefLoweringPass.cs | 82 -- .../RefTagHelperDescriptorProvider.cs | 62 - .../Resources.Designer.cs | 270 ---- .../Resources.resx | 189 --- .../RouteAttributeExtensionNode.cs | 34 - .../ScopeStack.cs | 91 -- .../ScriptTagPass.cs | 67 - ...elperBoundAttributeDescriptorExtensions.cs | 156 --- .../TagHelperDescriptorExtensions.cs | 199 --- .../TemplateDiagnosticPass.cs | 60 - .../TrimWhitespacePass.cs | 101 -- .../TypeParamDirective.cs | 32 - .../ITagHelper.cs | 20 - ...Core.Components.TagHelperWorkaround.csproj | 10 - .../RenderTree/RenderTreeBuilder.cs | 6 +- ...ft.AspNetCore.Components.Build.Test.csproj | 1 - .../BaseTagHelperDescriptorProviderTest.cs | 53 - .../BindTagHelperDescriptorProviderTest.cs | 683 --------- .../ComponentDocumentRewritePassTest.cs | 476 ------- ...omponentTagHelperDescriptorProviderTest.cs | 1243 ----------------- ...tHandlerTagHelperDescriptorProviderTest.cs | 125 -- .../GenericTypeNameRewriterTest.cs | 46 - .../GlobalQualifiedTypeNameRewriterTest.cs | 38 - .../HtmlBlockPassTest.cs | 385 ----- ...re.Components.Razor.Extensions.Test.csproj | 33 - .../NodeAssert.cs | 126 -- .../RefTagHelperDescriptorProviderTest.cs | 84 -- .../xunit.runner.json | 3 - 84 files changed, 55 insertions(+), 13421 deletions(-) delete mode 100644 src/Components/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/BlazorProjectEngineFactory.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindLoweringPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindTagHelperDescriptorProvider.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCSharpLoweringPhase.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCodeTarget.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDesignTimeNodeWriter.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDiagnosticFactory.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorExtensionInitializer.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorImportProjectFeature.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorMetadata.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorNodeWriter.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorRuntimeNodeWriter.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorTemplateTargetExtension.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/CSharpIdentifier.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ChildContentDiagnosticPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/CodeWriterExtensions.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComplexAttributeContentPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentAttributeExtensionNode.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentChildContentIntermediateNode.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentClassifierPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentRewritePass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentExtensionNode.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentLoweringPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTagHelperDescriptorProvider.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeArgumentExtensionNode.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeInferenceMethodIntermediateNode.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/DocumentIntermediateNodeExtensions.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EliminateMethodBodyPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerLoweringPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerTagHelperDescriptorProvider.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericComponentPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericTypeNameRewriter.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GlobalQualifiedTypeNameRewriter.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockIntermediateNode.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlElementIntermediateNode.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirective.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirectivePass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/InjectDirective.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirective.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirectivePass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Microsoft.AspNetCore.Components.Razor.Extensions.csproj delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirective.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirectivePass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Properties/AssemblyInfo.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RazorCompilerException.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefExtensionNode.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefLoweringPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefTagHelperDescriptorProvider.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.Designer.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.resx delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RouteAttributeExtensionNode.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScopeStack.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScriptTagPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/TagHelperBoundAttributeDescriptorExtensions.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/TagHelperDescriptorExtensions.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/TemplateDiagnosticPass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/TrimWhitespacePass.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/TypeParamDirective.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.TagHelperWorkaround/ITagHelper.cs delete mode 100644 src/Components/src/Microsoft.AspNetCore.Components.TagHelperWorkaround/Microsoft.AspNetCore.Components.TagHelperWorkaround.csproj delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/BaseTagHelperDescriptorProviderTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/BindTagHelperDescriptorProviderTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/ComponentDocumentRewritePassTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/ComponentTagHelperDescriptorProviderTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/EventHandlerTagHelperDescriptorProviderTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/GenericTypeNameRewriterTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/GlobalQualifiedTypeNameRewriterTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/HtmlBlockPassTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/Microsoft.AspNetCore.Components.Razor.Extensions.Test.csproj delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/NodeAssert.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/RefTagHelperDescriptorProviderTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/xunit.runner.json diff --git a/build/artifacts.props b/build/artifacts.props index 1ccbe04263..f8e9e9b507 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -36,7 +36,6 @@ This can be done once #4246 is complete, and done in conjunction with converting - diff --git a/src/Components/Components.sln b/src/Components/Components.sln index 8119ccce36..bc11818870 100644 --- a/src/Components/Components.sln +++ b/src/Components/Components.sln @@ -1,24 +1,55 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28306.52 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28414.68 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B867E038-B3CE-43E3-9292-61568C46CDEB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostedInAspNet", "HostedInAspNet", "{4D367450-96E9-4C8C-8B56-EED8ADE3A20D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoSanity", "MonoSanity", "{2A076721-6081-4517-8329-B9E5110D6DAC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testapps", "testapps", "{4AE0D35B-D97A-44D0-8392-C9240377DCCE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{E8EBA72C-D555-43AE-BC98-F0B2D05F6A07}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorHosted-CSharp", "BlazorHosted-CSharp", "{73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tooling", "tooling", "{F563ABB6-85FB-4CFC-B0D2-1D5130E8246D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{36A7DEB7-5F88-4BFB-B57E-79EEC9950E25}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentsApp", "ComponentsApp", "{3173A9C0-4F66-4064-83EC-3C206F1430FB}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "blazor", "blazor", "{E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{DDE4B710-6936-4E17-9CA0-54C45333ED15}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C7B9207E-BF85-422D-9EBC-E243C399F619}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{A63F9FCD-29D7-4D49-BC70-7E0F57D0BA60}" + ProjectSection(SolutionItems) = preProject + src\shared\ComponentsApi.cs = src\shared\ComponentsApi.cs + src\shared\ConventionBasedStartup.cs = src\shared\ConventionBasedStartup.cs + src\shared\IBlazorStartup.cs = src\shared\IBlazorStartup.cs + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{32B33872-B599-4913-9F90-EDB5F9E24B18}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoSanity", "blazor\samples\MonoSanity\MonoSanity.csproj", "{7C53BB6B-5906-4753-B507-C9FCC2F7E5B7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Server", "src\Microsoft.AspNetCore.Components.Server\Microsoft.AspNetCore.Components.Server.csproj", "{5A694793-3257-4D37-BB74-4A41B3894685}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.E2ETest", "test\Microsoft.AspNetCore.Components.E2ETest\Microsoft.AspNetCore.Components.E2ETest.csproj", "{5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoSanityClient", "blazor\samples\MonoSanityClient\MonoSanityClient.csproj", "{06AAAE9E-96DE-4574-97DA-9C4C7D9FE990}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostedInAspNet", "HostedInAspNet", "{4D367450-96E9-4C8C-8B56-EED8ADE3A20D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedInAspNet.Client", "blazor\samples\HostedInAspNet.Client\HostedInAspNet.Client.csproj", "{B4335F7C-4E86-4559-821F-F1B1C75F5FAE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedInAspNet.Server", "blazor\samples\HostedInAspNet.Server\HostedInAspNet.Server.csproj", "{F8996835-41F7-4663-91DF-3B5652ADC37D}" @@ -27,8 +58,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandaloneApp", "blazor\samples\StandaloneApp\StandaloneApp.csproj", "{B241434A-1642-44CC-AE9A-2012B5C5BD02}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoSanity", "MonoSanity", "{2A076721-6081-4517-8329-B9E5110D6DAC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Build.Test", "test\Microsoft.AspNetCore.Components.Build.Test\Microsoft.AspNetCore.Components.Build.Test.csproj", "{709C7EBE-EB93-4F6D-9491-D714B0D2E898}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Build", "src\Microsoft.AspNetCore.Components.Build\Microsoft.AspNetCore.Components.Build.csproj", "{8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815}" @@ -37,34 +66,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Test", "test\Microsoft.AspNetCore.Components.Test\Microsoft.AspNetCore.Components.Test.csproj", "{8FD8636E-AFA5-434D-8857-06D02686741A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testapps", "testapps", "{4AE0D35B-D97A-44D0-8392-C9240377DCCE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestApp", "test\testapps\BasicTestApp\BasicTestApp.csproj", "{2838CB6F-D2C7-4C0A-A994-C72E56F16984}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Razor.Extensions", "src\Microsoft.AspNetCore.Components.Razor.Extensions\Microsoft.AspNetCore.Components.Razor.Extensions.csproj", "{D652A019-B765-4922-B7B8-3AB1C58338D7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServer", "test\testapps\TestServer\TestServer.csproj", "{29CD3FC6-49E3-4756-B5DF-E03B46E5CD45}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Cli", "blazor\src\Microsoft.AspNetCore.Blazor.Cli\Microsoft.AspNetCore.Blazor.Cli.csproj", "{AF79BB84-BAE6-4F9A-9AD5-B0E3D7455288}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Templates", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\Microsoft.AspNetCore.Blazor.Templates.csproj", "{8C160273-0A1D-4D79-9F7B-7687B2D2F7C4}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{E8EBA72C-D555-43AE-BC98-F0B2D05F6A07}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorHosted-CSharp", "BlazorHosted-CSharp", "{73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Razor.Extensions.Test", "test\Microsoft.AspNetCore.Components.Razor.Extensions.Test\Microsoft.AspNetCore.Components.Razor.Extensions.Test.csproj", "{FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tooling", "tooling", "{F563ABB6-85FB-4CFC-B0D2-1D5130E8246D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.LanguageServices.Blazor", "blazor\tooling\Microsoft.VisualStudio.LanguageServices.Blazor\Microsoft.VisualStudio.LanguageServices.Blazor.csproj", "{43E39257-7DC1-46BD-9BD9-2319A1313D07}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.BlazorExtension", "blazor\tooling\Microsoft.VisualStudio.BlazorExtension\Microsoft.VisualStudio.BlazorExtension.csproj", "{9088E4E4-B855-457F-AE9E-D86709A5E1F4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestContentPackage", "test\testapps\TestContentPackage\TestContentPackage.csproj", "{C57382BC-EE93-49D5-BC40-5C98AF8AA048}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{36A7DEB7-5F88-4BFB-B57E-79EEC9950E25}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Performance", "benchmarks\Microsoft.AspNetCore.Components.Performance\Microsoft.AspNetCore.Components.Performance.csproj", "{50F6820F-D058-4E68-9E15-801F893F514E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Analyzers", "src\Microsoft.AspNetCore.Components.Analyzers\Microsoft.AspNetCore.Components.Analyzers.csproj", "{6DDD6A29-0A3E-417F-976C-5FE3FDA74055}" @@ -73,24 +88,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Server.Test", "test\Microsoft.AspNetCore.Components.Server.Test\Microsoft.AspNetCore.Components.Server.Test.csproj", "{142AA6BC-5110-486B-A34D-6878E5E2CE95}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentsApp", "ComponentsApp", "{3173A9C0-4F66-4064-83EC-3C206F1430FB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.Server", "samples\ComponentsApp.Server\ComponentsApp.Server.csproj", "{5655AFF9-612C-4947-8221-7DB6949A6CA4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.App", "samples\ComponentsApp.App\ComponentsApp.App.csproj", "{33C361D8-CAF1-47C0-A344-251AEF4FE1FE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.E2EPerformance", "blazor\benchmarks\Microsoft.AspNetCore.Blazor.E2EPerformance\Microsoft.AspNetCore.Blazor.E2EPerformance.csproj", "{CCEC81C4-1A3C-40DC-952F-074712C46180}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.TagHelperWorkaround", "src\Microsoft.AspNetCore.Components.TagHelperWorkaround\Microsoft.AspNetCore.Components.TagHelperWorkaround.csproj", "{F71D78AB-A07E-415D-BF3F-1B9991628214}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "blazor", "blazor", "{E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{DDE4B710-6936-4E17-9CA0-54C45333ED15}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C7B9207E-BF85-422D-9EBC-E243C399F619}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLibrary-CSharp", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorLibrary-CSharp\BlazorLibrary-CSharp.csproj", "{8C5D8A27-E6E6-4E5B-9389-206B5519658C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Client", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted-CSharp\BlazorHosted-CSharp.Client\BlazorHosted-CSharp.Client.csproj", "{61150807-8DBD-4456-9C6E-D97268181C2B}" @@ -101,16 +104,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Shared" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorStandalone-CSharp", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorStandalone-CSharp\BlazorStandalone-CSharp.csproj", "{2F92DE29-78E9-4A04-8F4F-F8F40E02FE98}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Blazor", "blazor\src\Microsoft.AspNetCore.Blazor\Microsoft.AspNetCore.Blazor.csproj", "{A42AC30B-45E3-4907-99A9-9ABDA45973D7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{A63F9FCD-29D7-4D49-BC70-7E0F57D0BA60}" - ProjectSection(SolutionItems) = preProject - src\shared\ComponentsApi.cs = src\shared\ComponentsApi.cs - src\shared\ConventionBasedStartup.cs = src\shared\ConventionBasedStartup.cs - src\shared\IBlazorStartup.cs = src\shared\IBlazorStartup.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{32B33872-B599-4913-9F90-EDB5F9E24B18}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor", "blazor\src\Microsoft.AspNetCore.Blazor\Microsoft.AspNetCore.Blazor.csproj", "{A42AC30B-45E3-4907-99A9-9ABDA45973D7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Test", "blazor\test\Microsoft.AspNetCore.Blazor.Test\Microsoft.AspNetCore.Blazor.Test.csproj", "{85813607-297F-4D39-92F7-89379FD80D70}" EndProject @@ -228,14 +222,6 @@ Global {2838CB6F-D2C7-4C0A-A994-C72E56F16984}.Release|Any CPU.Build.0 = Release|Any CPU {2838CB6F-D2C7-4C0A-A994-C72E56F16984}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU {2838CB6F-D2C7-4C0A-A994-C72E56F16984}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {D652A019-B765-4922-B7B8-3AB1C58338D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D652A019-B765-4922-B7B8-3AB1C58338D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D652A019-B765-4922-B7B8-3AB1C58338D7}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {D652A019-B765-4922-B7B8-3AB1C58338D7}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {D652A019-B765-4922-B7B8-3AB1C58338D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D652A019-B765-4922-B7B8-3AB1C58338D7}.Release|Any CPU.Build.0 = Release|Any CPU - {D652A019-B765-4922-B7B8-3AB1C58338D7}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {D652A019-B765-4922-B7B8-3AB1C58338D7}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU {29CD3FC6-49E3-4756-B5DF-E03B46E5CD45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {29CD3FC6-49E3-4756-B5DF-E03B46E5CD45}.Debug|Any CPU.Build.0 = Debug|Any CPU {29CD3FC6-49E3-4756-B5DF-E03B46E5CD45}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU @@ -260,14 +246,6 @@ Global {8C160273-0A1D-4D79-9F7B-7687B2D2F7C4}.Release|Any CPU.Build.0 = Release|Any CPU {8C160273-0A1D-4D79-9F7B-7687B2D2F7C4}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU {8C160273-0A1D-4D79-9F7B-7687B2D2F7C4}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.Release|Any CPU.Build.0 = Release|Any CPU - {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU {43E39257-7DC1-46BD-9BD9-2319A1313D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43E39257-7DC1-46BD-9BD9-2319A1313D07}.Debug|Any CPU.Build.0 = Debug|Any CPU {43E39257-7DC1-46BD-9BD9-2319A1313D07}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU @@ -346,14 +324,6 @@ Global {CCEC81C4-1A3C-40DC-952F-074712C46180}.Release|Any CPU.Build.0 = Release|Any CPU {CCEC81C4-1A3C-40DC-952F-074712C46180}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU {CCEC81C4-1A3C-40DC-952F-074712C46180}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {F71D78AB-A07E-415D-BF3F-1B9991628214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F71D78AB-A07E-415D-BF3F-1B9991628214}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F71D78AB-A07E-415D-BF3F-1B9991628214}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {F71D78AB-A07E-415D-BF3F-1B9991628214}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {F71D78AB-A07E-415D-BF3F-1B9991628214}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F71D78AB-A07E-415D-BF3F-1B9991628214}.Release|Any CPU.Build.0 = Release|Any CPU - {F71D78AB-A07E-415D-BF3F-1B9991628214}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {F71D78AB-A07E-415D-BF3F-1B9991628214}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU {8C5D8A27-E6E6-4E5B-9389-206B5519658C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8C5D8A27-E6E6-4E5B-9389-206B5519658C}.Debug|Any CPU.Build.0 = Debug|Any CPU {8C5D8A27-E6E6-4E5B-9389-206B5519658C}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU @@ -423,30 +393,34 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {4D367450-96E9-4C8C-8B56-EED8ADE3A20D} = {C7B9207E-BF85-422D-9EBC-E243C399F619} + {2A076721-6081-4517-8329-B9E5110D6DAC} = {C7B9207E-BF85-422D-9EBC-E243C399F619} + {4AE0D35B-D97A-44D0-8392-C9240377DCCE} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} + {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} + {73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8} = {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} + {F563ABB6-85FB-4CFC-B0D2-1D5130E8246D} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} + {3173A9C0-4F66-4064-83EC-3C206F1430FB} = {F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA} + {DDE4B710-6936-4E17-9CA0-54C45333ED15} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} + {C7B9207E-BF85-422D-9EBC-E243C399F619} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} + {AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} + {A63F9FCD-29D7-4D49-BC70-7E0F57D0BA60} = {B867E038-B3CE-43E3-9292-61568C46CDEB} + {32B33872-B599-4913-9F90-EDB5F9E24B18} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} {7C53BB6B-5906-4753-B507-C9FCC2F7E5B7} = {2A076721-6081-4517-8329-B9E5110D6DAC} {5A694793-3257-4D37-BB74-4A41B3894685} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {06AAAE9E-96DE-4574-97DA-9C4C7D9FE990} = {2A076721-6081-4517-8329-B9E5110D6DAC} - {4D367450-96E9-4C8C-8B56-EED8ADE3A20D} = {C7B9207E-BF85-422D-9EBC-E243C399F619} {B4335F7C-4E86-4559-821F-F1B1C75F5FAE} = {4D367450-96E9-4C8C-8B56-EED8ADE3A20D} {F8996835-41F7-4663-91DF-3B5652ADC37D} = {4D367450-96E9-4C8C-8B56-EED8ADE3A20D} {7FD8C650-74B3-4153-AEA1-00F4F6AF393D} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {B241434A-1642-44CC-AE9A-2012B5C5BD02} = {C7B9207E-BF85-422D-9EBC-E243C399F619} - {2A076721-6081-4517-8329-B9E5110D6DAC} = {C7B9207E-BF85-422D-9EBC-E243C399F619} {709C7EBE-EB93-4F6D-9491-D714B0D2E898} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {8A19B1CE-9B62-4440-93B3-152DDBB39D0A} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {8FD8636E-AFA5-434D-8857-06D02686741A} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} - {4AE0D35B-D97A-44D0-8392-C9240377DCCE} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {2838CB6F-D2C7-4C0A-A994-C72E56F16984} = {4AE0D35B-D97A-44D0-8392-C9240377DCCE} - {D652A019-B765-4922-B7B8-3AB1C58338D7} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {29CD3FC6-49E3-4756-B5DF-E03B46E5CD45} = {4AE0D35B-D97A-44D0-8392-C9240377DCCE} {AF79BB84-BAE6-4F9A-9AD5-B0E3D7455288} = {AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4} {8C160273-0A1D-4D79-9F7B-7687B2D2F7C4} = {AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4} - {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} - {73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8} = {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} - {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} - {F563ABB6-85FB-4CFC-B0D2-1D5130E8246D} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} {43E39257-7DC1-46BD-9BD9-2319A1313D07} = {F563ABB6-85FB-4CFC-B0D2-1D5130E8246D} {9088E4E4-B855-457F-AE9E-D86709A5E1F4} = {F563ABB6-85FB-4CFC-B0D2-1D5130E8246D} {C57382BC-EE93-49D5-BC40-5C98AF8AA048} = {4AE0D35B-D97A-44D0-8392-C9240377DCCE} @@ -454,22 +428,15 @@ Global {6DDD6A29-0A3E-417F-976C-5FE3FDA74055} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {CF3B5990-7A05-4993-AACA-D2C8D7AFF6E6} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {142AA6BC-5110-486B-A34D-6878E5E2CE95} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} - {3173A9C0-4F66-4064-83EC-3C206F1430FB} = {F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA} {5655AFF9-612C-4947-8221-7DB6949A6CA4} = {3173A9C0-4F66-4064-83EC-3C206F1430FB} {33C361D8-CAF1-47C0-A344-251AEF4FE1FE} = {3173A9C0-4F66-4064-83EC-3C206F1430FB} {CCEC81C4-1A3C-40DC-952F-074712C46180} = {DDE4B710-6936-4E17-9CA0-54C45333ED15} - {F71D78AB-A07E-415D-BF3F-1B9991628214} = {B867E038-B3CE-43E3-9292-61568C46CDEB} - {DDE4B710-6936-4E17-9CA0-54C45333ED15} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} - {C7B9207E-BF85-422D-9EBC-E243C399F619} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} - {AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} {8C5D8A27-E6E6-4E5B-9389-206B5519658C} = {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} {61150807-8DBD-4456-9C6E-D97268181C2B} = {73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8} {EB8B8216-BD47-4635-A23D-21135943F2B7} = {73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8} {46B3D506-E351-4668-AC65-0719191B06A7} = {73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8} {2F92DE29-78E9-4A04-8F4F-F8F40E02FE98} = {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} {A42AC30B-45E3-4907-99A9-9ABDA45973D7} = {AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4} - {A63F9FCD-29D7-4D49-BC70-7E0F57D0BA60} = {B867E038-B3CE-43E3-9292-61568C46CDEB} - {32B33872-B599-4913-9F90-EDB5F9E24B18} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} {85813607-297F-4D39-92F7-89379FD80D70} = {32B33872-B599-4913-9F90-EDB5F9E24B18} {E52F5005-26EA-4764-8ECF-41D324AAA6D9} = {B867E038-B3CE-43E3-9292-61568C46CDEB} EndGlobalSection diff --git a/src/Components/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj b/src/Components/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj index cc6bba7808..335871c2e4 100644 --- a/src/Components/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj +++ b/src/Components/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj @@ -1,7 +1,7 @@ - 15.0 + 16.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) true @@ -130,20 +130,6 @@ - - Microsoft.AspNetCore.Components.Razor.Extensions - False - - - - - - - Microsoft.AspNetCore.Components.Razor.Extensions.dll - true - PreserveNewest - false - {b9f7f502-6dd2-4e77-8fd1-cbd76f695b26} Microsoft.VisualStudio.LanguageServices.Blazor @@ -159,16 +145,6 @@ PreserveNewest false - - - AngleSharp.dll - true - PreserveNewest - false - - @@ -31,10 +30,6 @@ - - - - @@ -67,13 +62,8 @@ - - - - - diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec index 3eb593da38..061cb6d862 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec @@ -13,14 +13,12 @@ true - - diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props b/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props index 4fbfbac254..c084a0e196 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props @@ -33,12 +33,10 @@ - - diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindLoweringPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindLoweringPass.cs deleted file mode 100644 index 92c8661eeb..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindLoweringPass.cs +++ /dev/null @@ -1,519 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Linq; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Extensions; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class BindLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass - { - // Run after event handler pass - public override int Order => 100; - - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - var @namespace = documentNode.FindPrimaryNamespace(); - var @class = documentNode.FindPrimaryClass(); - if (@namespace == null || @class == null) - { - // Nothing to do, bail. We can't function without the standard structure. - return; - } - - // For each bind *usage* we need to rewrite the tag helper node to map to basic constructs. - var references = documentNode.FindDescendantReferences(); - - var parents = new HashSet(); - for (var i = 0; i < references.Count; i++) - { - parents.Add(references[i].Parent); - } - - foreach (var parent in parents) - { - ProcessDuplicates(parent); - } - - for (var i = 0; i < references.Count; i++) - { - var reference = references[i]; - var node = (TagHelperPropertyIntermediateNode)reference.Node; - - if (!reference.Parent.Children.Contains(node)) - { - // This node was removed as a duplicate, skip it. - continue; - } - - if (node.TagHelper.IsBindTagHelper() && node.AttributeName.StartsWith("bind")) - { - // Workaround for https://github.com/aspnet/Blazor/issues/703 - var rewritten = RewriteUsage(reference.Parent, node); - reference.Remove(); - - for (var j = 0; j < rewritten.Length; j++) - { - reference.Parent.Children.Add(rewritten[j]); - } - } - } - } - - private void ProcessDuplicates(IntermediateNode node) - { - // Reverse order because we will remove nodes. - // - // Each 'property' node could be duplicated if there are multiple tag helpers that match that - // particular attribute. This is common in our approach, which relies on 'fallback' tag helpers - // that overlap with more specific ones. - for (var i = node.Children.Count - 1; i >= 0; i--) - { - // For each usage of the general 'fallback' bind tag helper, it could duplicate - // the usage of a more specific one. Look for duplicates and remove the fallback. - var attribute = node.Children[i] as TagHelperPropertyIntermediateNode; - if (attribute != null && - attribute.TagHelper != null && - attribute.TagHelper.IsFallbackBindTagHelper()) - { - for (var j = 0; j < node.Children.Count; j++) - { - var duplicate = node.Children[j] as TagHelperPropertyIntermediateNode; - if (duplicate != null && - duplicate.TagHelper != null && - duplicate.TagHelper.IsBindTagHelper() && - duplicate.AttributeName == attribute.AttributeName && - !object.ReferenceEquals(attribute, duplicate)) - { - // Found a duplicate - remove the 'fallback' in favor of the - // more specific tag helper. - node.Children.RemoveAt(i); - break; - } - } - } - - // Also treat the general as a 'fallback' for that case and remove it. - // This is a workaround for a limitation where you can't write a tag helper that binds only - // when a specific attribute is **not** present. - if (attribute != null && - attribute.TagHelper != null && - attribute.TagHelper.IsInputElementFallbackBindTagHelper()) - { - for (var j = 0; j < node.Children.Count; j++) - { - var duplicate = node.Children[j] as TagHelperPropertyIntermediateNode; - if (duplicate != null && - duplicate.TagHelper != null && - duplicate.TagHelper.IsInputElementBindTagHelper() && - duplicate.AttributeName == attribute.AttributeName && - !object.ReferenceEquals(attribute, duplicate)) - { - // Found a duplicate - remove the 'fallback' input tag helper in favor of the - // more specific tag helper. - node.Children.RemoveAt(i); - break; - } - } - } - } - - // If we still have duplicates at this point then they are genuine conflicts. - var duplicates = node.Children - .OfType() - .GroupBy(p => p.AttributeName) - .Where(g => g.Count() > 1); - - foreach (var duplicate in duplicates) - { - node.Diagnostics.Add(BlazorDiagnosticFactory.CreateBindAttribute_Duplicates( - node.Source, - duplicate.Key, - duplicate.ToArray())); - foreach (var property in duplicate) - { - node.Children.Remove(property); - } - } - } - - private IntermediateNode[] RewriteUsage(IntermediateNode parent, TagHelperPropertyIntermediateNode node) - { - // Bind works similarly to a macro, it always expands to code that the user could have written. - // - // For the nodes that are related to the bind-attribute rewrite them to look like a pair of - // 'normal' HTML attributes similar to the following transformation. - // - // Input: - // Output: - // - // This means that the expression that appears inside of 'bind' must be an LValue or else - // there will be errors. In general the errors that come from C# in this case are good enough - // to understand the problem. - // - // The BindMethods calls are required in this case because to give us a good experience. They - // use overloading to ensure that can get an Action that will convert and set an arbitrary - // value. - // - // We also assume that the element will be treated as a component for now because - // multiple passes handle 'special' tag helpers. We have another pass that translates - // a tag helper node back into 'regular' element when it doesn't have an associated component - if (!TryComputeAttributeNames( - parent, - node, - node.AttributeName, - out var valueAttributeName, - out var changeAttributeName, - out var valueAttribute, - out var changeAttribute)) - { - // Skip anything we can't understand. It's important that we don't crash, that will bring down - // the build. - node.Diagnostics.Add(BlazorDiagnosticFactory.CreateBindAttribute_InvalidSyntax( - node.Source, - node.AttributeName)); - return new[] { node }; - } - - var original = GetAttributeContent(node); - if (string.IsNullOrEmpty(original.Content)) - { - // This can happen in error cases, the parser will already have flagged this - // as an error, so ignore it. - return new[] { node }; - } - - // Look for a matching format node. If we find one then we need to pass the format into the - // two nodes we generate. - IntermediateToken format = null; - if (TryGetFormatNode( - parent, - node, - valueAttributeName, - out var formatNode)) - { - // Don't write the format out as its own attribute, just capture it as a string - // or expression. - parent.Children.Remove(formatNode); - format = GetAttributeContent(formatNode); - } - - // Now rewrite the content of the value node to look like: - // - // BindMethods.GetValue() OR - // BindMethods.GetValue(, ) - var valueExpressionTokens = new List(); - valueExpressionTokens.Add(new IntermediateToken() - { - Content = $"{ComponentsApi.BindMethods.GetValue}(", - Kind = TokenKind.CSharp - }); - valueExpressionTokens.Add(original); - if (!string.IsNullOrEmpty(format?.Content)) - { - valueExpressionTokens.Add(new IntermediateToken() - { - Content = ", ", - Kind = TokenKind.CSharp, - }); - valueExpressionTokens.Add(format); - } - valueExpressionTokens.Add(new IntermediateToken() - { - Content = ")", - Kind = TokenKind.CSharp, - }); - - // Now rewrite the content of the change-handler node. There are two cases we care about - // here. If it's a component attribute, then don't use the 'BindMethods wrapper. We expect - // component attributes to always 'match' on type. - // - // __value => = __value - // - // For general DOM attributes, we need to be able to create a delegate that accepts UIEventArgs - // so we use BindMethods.SetValueHandler - // - // BindMethods.SetValueHandler(__value => = __value, ) OR - // BindMethods.SetValueHandler(__value => = __value, , ) - // - // Note that the linemappings here are applied to the value attribute, not the change attribute. - - string changeExpressionContent = null; - if (changeAttribute == null && format == null) - { - changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content})"; - } - else if (changeAttribute == null && format != null) - { - changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content}, {format.Content})"; - } - else - { - changeExpressionContent = $"__value => {original.Content} = __value"; - } - var changeExpressionTokens = new List() - { - new IntermediateToken() - { - Content = changeExpressionContent, - Kind = TokenKind.CSharp - } - }; - - if (parent is HtmlElementIntermediateNode) - { - var valueNode = new HtmlAttributeIntermediateNode() - { - AttributeName = valueAttributeName, - Source = node.Source, - - Prefix = valueAttributeName + "=\"", - Suffix = "\"", - }; - - for (var i = 0; i < node.Diagnostics.Count; i++) - { - valueNode.Diagnostics.Add(node.Diagnostics[i]); - } - - valueNode.Children.Add(new CSharpExpressionAttributeValueIntermediateNode()); - for (var i = 0; i < valueExpressionTokens.Count; i++) - { - valueNode.Children[0].Children.Add(valueExpressionTokens[i]); - } - - var changeNode = new HtmlAttributeIntermediateNode() - { - AttributeName = changeAttributeName, - Source = node.Source, - - Prefix = changeAttributeName + "=\"", - Suffix = "\"", - }; - - changeNode.Children.Add(new CSharpExpressionAttributeValueIntermediateNode()); - for (var i = 0; i < changeExpressionTokens.Count; i++) - { - changeNode.Children[0].Children.Add(changeExpressionTokens[i]); - } - - return new[] { valueNode, changeNode }; - } - else - { - var valueNode = new ComponentAttributeExtensionNode(node) - { - AttributeName = valueAttributeName, - BoundAttribute = valueAttribute, // Might be null if it doesn't match a component attribute - PropertyName = valueAttribute?.GetPropertyName(), - TagHelper = valueAttribute == null ? null : node.TagHelper, - TypeName = valueAttribute?.IsWeaklyTyped() == false ? valueAttribute.TypeName : null, - }; - - valueNode.Children.Clear(); - valueNode.Children.Add(new CSharpExpressionIntermediateNode()); - for (var i = 0; i < valueExpressionTokens.Count; i++) - { - valueNode.Children[0].Children.Add(valueExpressionTokens[i]); - } - - var changeNode = new ComponentAttributeExtensionNode(node) - { - AttributeName = changeAttributeName, - BoundAttribute = changeAttribute, // Might be null if it doesn't match a component attribute - PropertyName = changeAttribute?.GetPropertyName(), - TagHelper = changeAttribute == null ? null : node.TagHelper, - TypeName = changeAttribute?.IsWeaklyTyped() == false ? changeAttribute.TypeName : null, - }; - - changeNode.Children.Clear(); - changeNode.Children.Add(new CSharpExpressionIntermediateNode()); - for (var i = 0; i < changeExpressionTokens.Count; i++) - { - changeNode.Children[0].Children.Add(changeExpressionTokens[i]); - } - - return new[] { valueNode, changeNode }; - } - } - - private bool TryParseBindAttribute( - string attributeName, - out string valueAttributeName, - out string changeAttributeName) - { - valueAttributeName = null; - changeAttributeName = null; - - if (!attributeName.StartsWith("bind")) - { - return false; - } - - if (attributeName == "bind") - { - return true; - } - - var segments = attributeName.Split('-'); - for (var i = 0; i < segments.Length; i++) - { - if (string.IsNullOrEmpty(segments[i])) - { - return false; - } - } - - switch (segments.Length) - { - case 2: - valueAttributeName = segments[1]; - return true; - - case 3: - changeAttributeName = segments[2]; - valueAttributeName = segments[1]; - return true; - - default: - return false; - } - } - - // Attempts to compute the attribute names that should be used for an instance of 'bind'. - private bool TryComputeAttributeNames( - IntermediateNode parent, - TagHelperPropertyIntermediateNode node, - string attributeName, - out string valueAttributeName, - out string changeAttributeName, - out BoundAttributeDescriptor valueAttribute, - out BoundAttributeDescriptor changeAttribute) - { - valueAttribute = null; - changeAttribute = null; - - // Even though some of our 'bind' tag helpers specify the attribute names, they - // should still satisfy one of the valid syntaxes. - if (!TryParseBindAttribute(attributeName, out valueAttributeName, out changeAttributeName)) - { - return false; - } - - // The tag helper specifies attribute names, they should win. - // - // This handles cases like where the tag helper is - // generated to match a specific tag and has metadata that identify the attributes. - // - // We expect 1 bind tag helper per-node. - valueAttributeName = node.TagHelper.GetValueAttributeName() ?? valueAttributeName; - changeAttributeName = node.TagHelper.GetChangeAttributeName() ?? changeAttributeName; - - // We expect 0-1 components per-node. - var componentTagHelper = (parent as ComponentExtensionNode)?.Component; - if (componentTagHelper == null) - { - // If it's not a component node then there isn't too much else to figure out. - return attributeName != null && changeAttributeName != null; - } - - // If this is a component, we need an attribute name for the value. - if (attributeName == null) - { - return false; - } - - // If this is a component, then we can infer 'Changed' as the name - // of the change event. - if (changeAttributeName == null) - { - changeAttributeName = valueAttributeName + "Changed"; - } - - for (var i = 0; i < componentTagHelper.BoundAttributes.Count; i++) - { - var attribute = componentTagHelper.BoundAttributes[i]; - - if (string.Equals(valueAttributeName, attribute.Name)) - { - valueAttribute = attribute; - } - - if (string.Equals(changeAttributeName, attribute.Name)) - { - changeAttribute = attribute; - } - } - - return true; - } - - private bool TryGetFormatNode( - IntermediateNode node, - TagHelperPropertyIntermediateNode attributeNode, - string valueAttributeName, - out TagHelperPropertyIntermediateNode formatNode) - { - for (var i = 0; i < node.Children.Count; i++) - { - var child = node.Children[i] as TagHelperPropertyIntermediateNode; - if (child != null && - child.TagHelper != null && - child.TagHelper == attributeNode.TagHelper && - child.AttributeName == "format-" + valueAttributeName) - { - formatNode = child; - return true; - } - } - - formatNode = null; - return false; - } - - private static IntermediateToken GetAttributeContent(TagHelperPropertyIntermediateNode node) - { - var template = node.FindDescendantNodes().FirstOrDefault(); - if (template != null) - { - // See comments in TemplateDiagnosticPass - node.Diagnostics.Add(BlazorDiagnosticFactory.Create_TemplateInvalidLocation(template.Source)); - return new IntermediateToken() { Kind = TokenKind.CSharp, Content = string.Empty, }; - } - - if (node.Children[0] is HtmlContentIntermediateNode htmlContentNode) - { - // This case can be hit for a 'string' attribute. We want to turn it into - // an expression. - var content = "\"" + string.Join(string.Empty, htmlContentNode.Children.OfType().Select(t => t.Content)) + "\""; - return new IntermediateToken() { Kind = TokenKind.CSharp, Content = content }; - } - else if (node.Children[0] is CSharpExpressionIntermediateNode cSharpNode) - { - // This case can be hit when the attribute has an explicit @ inside, which - // 'escapes' any special sugar we provide for codegen. - return GetToken(cSharpNode); - } - else - { - // This is the common case for 'mixed' content - return GetToken(node); - } - - // In error cases we won't have a single token, but we still want to generate the code. - IntermediateToken GetToken(IntermediateNode parent) - { - return - parent.Children.Count == 1 ? (IntermediateToken)parent.Children[0] : new IntermediateToken() - { - Kind = TokenKind.CSharp, - Content = string.Join(string.Empty, parent.Children.OfType().Select(t => t.Content)), - }; - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindTagHelperDescriptorProvider.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindTagHelperDescriptorProvider.cs deleted file mode 100644 index c81f3c09e4..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindTagHelperDescriptorProvider.cs +++ /dev/null @@ -1,492 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Razor; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class BindTagHelperDescriptorProvider : ITagHelperDescriptorProvider - { - // Run after the component tag helper provider, because we need to see the results. - public int Order { get; set; } = 1000; - - public RazorEngine Engine { get; set; } - - public void Execute(TagHelperDescriptorProviderContext context) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - // This provider returns tag helper information for 'bind' which doesn't necessarily - // map to any real component. Bind behaviors more like a macro, which can map a single LValue to - // both a 'value' attribute and a 'value changed' attribute. - // - // User types: - // - // - // We generate: - // - // - // This isn't very different from code the user could write themselves - thus the pronouncement - // that bind is very much like a macro. - // - // A lot of the value that provide in this case is that the associations between the - // elements, and the attributes aren't straightforward. - // - // For instance on we need to listen to 'value' and 'onchange', - // but on - // and so we have a special case for input elements and their type attributes. - // - // 4. For components, we have a bit of a special case. We can infer a syntax that matches - // case #2 based on property names. So if a component provides both 'Value' and 'ValueChanged' - // we will turn that into an instance of bind. - // - // So case #1 here is the most general case. Case #2 and #3 are data-driven based on attribute data - // we have. Case #4 is data-driven based on component definitions. - // - // We provide a good set of attributes that map to the HTML dom. This set is user extensible. - var compilation = context.GetCompilation(); - if (compilation == null) - { - return; - } - - var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.BindMethods.FullTypeName); - if (bindMethods == null) - { - // If we can't find BindMethods, then just bail. We won't be able to compile the - // generated code anyway. - return; - } - - // Tag Helper defintion for case #1. This is the most general case. - context.Results.Add(CreateFallbackBindTagHelper()); - - // For case #2 & #3 we have a whole bunch of attribute entries on BindMethods that we can use - // to data-drive the definitions of these tag helpers. - var elementBindData = GetElementBindData(compilation); - - // Case #2 & #3 - foreach (var tagHelper in CreateElementBindTagHelpers(elementBindData)) - { - context.Results.Add(tagHelper); - } - - // For case #4 we look at the tag helpers that were already created corresponding to components - // and pattern match on properties. - foreach (var tagHelper in CreateComponentBindTagHelpers(context.Results)) - { - context.Results.Add(tagHelper); - } - } - - private TagHelperDescriptor CreateFallbackBindTagHelper() - { - var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, "Bind", ComponentsApi.AssemblyName); - builder.Documentation = Resources.BindTagHelper_Fallback_Documentation; - - builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind); - builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName; - builder.Metadata[BlazorMetadata.Bind.FallbackKey] = bool.TrueString; - - // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the toolips. - builder.SetTypeName("Microsoft.AspNetCore.Components.Bind"); - - builder.TagMatchingRule(rule => - { - rule.TagName = "*"; - rule.Attribute(attribute => - { - attribute.Name = "bind-"; - attribute.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch; - }); - }); - - builder.BindAttribute(attribute => - { - attribute.Documentation = Resources.BindTagHelper_Fallback_Documentation; - - attribute.Name = "bind-..."; - attribute.AsDictionary("bind-", typeof(object).FullName); - - // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the toolips. - attribute.SetPropertyName("Bind"); - attribute.TypeName = "System.Collections.Generic.Dictionary"; - }); - - builder.BindAttribute(attribute => - { - attribute.Documentation = Resources.BindTagHelper_Fallback_Format_Documentation; - - attribute.Name = "format-..."; - attribute.AsDictionary("format-", typeof(string).FullName); - - // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the toolips. - attribute.SetPropertyName("Format"); - attribute.TypeName = "System.Collections.Generic.Dictionary"; - }); - - return builder.Build(); - } - - private List GetElementBindData(Compilation compilation) - { - var bindElement = compilation.GetTypeByMetadataName(ComponentsApi.BindElementAttribute.FullTypeName); - var bindInputElement = compilation.GetTypeByMetadataName(ComponentsApi.BindInputElementAttribute.FullTypeName); - - if (bindElement == null || bindInputElement == null) - { - // This won't likely happen, but just in case. - return new List(); - } - - var types = new List(); - var visitor = new BindElementDataVisitor(types); - - // Visit the primary output of this compilation, as well as all references. - visitor.Visit(compilation.Assembly); - foreach (var reference in compilation.References) - { - // We ignore .netmodules here - there really isn't a case where they are used by user code - // even though the Roslyn APIs all support them. - if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly) - { - visitor.Visit(assembly); - } - } - - var results = new List(); - - for (var i = 0; i < types.Count; i++) - { - var type = types[i]; - var attributes = type.GetAttributes(); - - // Not handling duplicates here for now since we're the primary ones extending this. - // If we see users adding to the set of 'bind' constructs we will want to add deduplication - // and potentially diagnostics. - for (var j = 0; j < attributes.Length; j++) - { - var attribute = attributes[j]; - - if (attribute.AttributeClass == bindElement) - { - results.Add(new ElementBindData( - type.ContainingAssembly.Name, - type.ToDisplayString(), - (string)attribute.ConstructorArguments[0].Value, - null, - (string)attribute.ConstructorArguments[1].Value, - (string)attribute.ConstructorArguments[2].Value, - (string)attribute.ConstructorArguments[3].Value)); - } - else if (attribute.AttributeClass == bindInputElement) - { - results.Add(new ElementBindData( - type.ContainingAssembly.Name, - type.ToDisplayString(), - "input", - (string)attribute.ConstructorArguments[0].Value, - (string)attribute.ConstructorArguments[1].Value, - (string)attribute.ConstructorArguments[2].Value, - (string)attribute.ConstructorArguments[3].Value)); - } - } - } - - return results; - } - private List CreateElementBindTagHelpers(List data) - { - var results = new List(); - - for (var i = 0; i < data.Count; i++) - { - var entry = data[i]; - - var name = entry.Suffix == null ? "Bind" : "Bind_" + entry.Suffix; - var attributeName = entry.Suffix == null ? "bind" : "bind-" + entry.Suffix; - - var formatName = entry.Suffix == null ? "Format_" + entry.ValueAttribute : "Format_" + entry.Suffix; - var formatAttributeName = entry.Suffix == null ? "format-" + entry.ValueAttribute : "format-" + entry.Suffix; - - var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, name, entry.Assembly); - builder.Documentation = string.Format( - Resources.BindTagHelper_Element_Documentation, - entry.ValueAttribute, - entry.ChangeAttribute); - - builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind); - builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName; - builder.Metadata[BlazorMetadata.Bind.ValueAttribute] = entry.ValueAttribute; - builder.Metadata[BlazorMetadata.Bind.ChangeAttribute] = entry.ChangeAttribute; - - if (entry.TypeAttribute != null) - { - // For entries that map to the element, we need to be able to know - // the difference between and for which we - // want to use the same attributes. - // - // We provide a tag helper for that should match all input elements, - // but we only want it to be used when a more specific one is used. - // - // Therefore we use this metadata to know which one is more specific when two - // tag helpers match. - builder.Metadata[BlazorMetadata.Bind.TypeAttribute] = entry.TypeAttribute; - } - - // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the toolips. - builder.SetTypeName(entry.TypeName); - - builder.TagMatchingRule(rule => - { - rule.TagName = entry.Element; - if (entry.TypeAttribute != null) - { - rule.Attribute(a => - { - a.Name = "type"; - a.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch; - a.Value = entry.TypeAttribute; - a.ValueComparisonMode = RequiredAttributeDescriptor.ValueComparisonMode.FullMatch; - }); - } - - rule.Attribute(a => - { - a.Name = attributeName; - a.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch; - }); - }); - - builder.BindAttribute(a => - { - a.Documentation = string.Format( - Resources.BindTagHelper_Element_Documentation, - entry.ValueAttribute, - entry.ChangeAttribute); - - a.Name = attributeName; - a.TypeName = typeof(object).FullName; - - // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the toolips. - a.SetPropertyName(name); - }); - - builder.BindAttribute(attribute => - { - attribute.Documentation = string.Format(Resources.BindTagHelper_Element_Format_Documentation, attributeName); - - attribute.Name = formatAttributeName; - attribute.TypeName = "System.String"; - - // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the toolips. - attribute.SetPropertyName(formatName); - }); - - results.Add(builder.Build()); - } - - return results; - } - - private List CreateComponentBindTagHelpers(ICollection tagHelpers) - { - var results = new List(); - - foreach (var tagHelper in tagHelpers) - { - if (!tagHelper.IsComponentTagHelper()) - { - continue; - } - - // We want to create a 'bind' tag helper everywhere we see a pair of properties like `Foo`, `FooChanged` - // where `FooChanged` is a delegate and `Foo` is not. - // - // The easiest way to figure this out without a lot of backtracking is to look for `FooChanged` and then - // try to find a matching "Foo". - for (var i = 0; i < tagHelper.BoundAttributes.Count; i++) - { - var changeAttribute = tagHelper.BoundAttributes[i]; - if (!changeAttribute.Name.EndsWith("Changed") || !changeAttribute.IsDelegateProperty()) - { - continue; - } - - BoundAttributeDescriptor valueAttribute = null; - var valueAttributeName = changeAttribute.Name.Substring(0, changeAttribute.Name.Length - "Changed".Length); - for (var j = 0; j < tagHelper.BoundAttributes.Count; j++) - { - if (tagHelper.BoundAttributes[j].Name == valueAttributeName && !tagHelper.BoundAttributes[j].IsDelegateProperty()) - { - valueAttribute = tagHelper.BoundAttributes[j]; - break; - } - } - - if (valueAttribute == null) - { - // No matching attribute found. - continue; - } - - var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, tagHelper.Name, tagHelper.AssemblyName); - builder.DisplayName = tagHelper.DisplayName; - builder.Documentation = string.Format( - Resources.BindTagHelper_Component_Documentation, - valueAttribute.Name, - changeAttribute.Name); - - builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind); - builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Bind.RuntimeName; - builder.Metadata[BlazorMetadata.Bind.ValueAttribute] = valueAttribute.Name; - builder.Metadata[BlazorMetadata.Bind.ChangeAttribute] = changeAttribute.Name; - - // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the toolips. - builder.SetTypeName(tagHelper.GetTypeName()); - - // Match the component and attribute name - builder.TagMatchingRule(rule => - { - rule.TagName = tagHelper.TagMatchingRules.Single().TagName; - rule.Attribute(attribute => - { - attribute.Name = "bind-" + valueAttribute.Name; - attribute.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch; - }); - }); - - builder.BindAttribute(attribute => - { - attribute.Documentation = string.Format( - Resources.BindTagHelper_Component_Documentation, - valueAttribute.Name, - changeAttribute.Name); - - attribute.Name = "bind-" + valueAttribute.Name; - attribute.TypeName = valueAttribute.TypeName; - attribute.IsEnum = valueAttribute.IsEnum; - - // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the toolips. - attribute.SetPropertyName(valueAttribute.GetPropertyName()); - }); - - results.Add(builder.Build()); - } - } - - return results; - } - - private struct ElementBindData - { - public ElementBindData( - string assembly, - string typeName, - string element, - string typeAttribute, - string suffix, - string valueAttribute, - string changeAttribute) - { - Assembly = assembly; - TypeName = typeName; - Element = element; - TypeAttribute = typeAttribute; - Suffix = suffix; - ValueAttribute = valueAttribute; - ChangeAttribute = changeAttribute; - } - - public string Assembly { get; } - public string TypeName { get; } - public string Element { get; } - public string TypeAttribute { get; } - public string Suffix { get; } - public string ValueAttribute { get; } - public string ChangeAttribute { get; } - } - - private class BindElementDataVisitor : SymbolVisitor - { - private List _results; - - public BindElementDataVisitor(List results) - { - _results = results; - } - - public override void VisitNamedType(INamedTypeSymbol symbol) - { - if (symbol.Name == "BindAttributes" && symbol.DeclaredAccessibility == Accessibility.Public) - { - _results.Add(symbol); - } - } - - public override void VisitNamespace(INamespaceSymbol symbol) - { - foreach (var member in symbol.GetMembers()) - { - Visit(member); - } - } - - public override void VisitAssembly(IAssemblySymbol symbol) - { - // This as a simple yet high-value optimization that excludes the vast majority of - // assemblies that (by definition) can't contain a component. - if (symbol.Name != null && !symbol.Name.StartsWith("System.", StringComparison.Ordinal)) - { - Visit(symbol.GlobalNamespace); - } - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCSharpLoweringPhase.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCSharpLoweringPhase.cs deleted file mode 100644 index 46802249b5..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCSharpLoweringPhase.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class BlazorRazorCSharpLoweringPhase : RazorEnginePhaseBase, IRazorCSharpLoweringPhase - { - protected override void ExecuteCore(RazorCodeDocument codeDocument) - { - var documentNode = codeDocument.GetDocumentIntermediateNode(); - ThrowForMissingDocumentDependency(documentNode); -#pragma warning disable CS0618 - var writer = new DocumentWriterWorkaround().Create(documentNode.Target, documentNode.Options); -#pragma warning restore CS0618 - try - { - var cSharpDocument = writer.WriteDocument(codeDocument, documentNode); - codeDocument.SetCSharpDocument(cSharpDocument); - } - catch (RazorCompilerException ex) - { - // Currently the Blazor code generation has some 'fatal errors' that can cause code generation - // to fail completely. This class is here to make that implementation work gracefully. - var cSharpDocument = RazorCSharpDocument.Create("", documentNode.Options, new[] { ex.Diagnostic }); - codeDocument.SetCSharpDocument(cSharpDocument); - } - } - - private class DocumentWriterWorkaround : DocumentWriter - { - public override RazorCSharpDocument WriteDocument(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - throw new NotImplementedException(); - } - } - } -} \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCodeTarget.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCodeTarget.cs deleted file mode 100644 index b5e2a7ac88..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCodeTarget.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Linq; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; - -namespace Microsoft.AspNetCore.Components.Razor -{ - /// - /// Directs a to use . - /// - internal class BlazorCodeTarget : CodeTarget - { - private readonly RazorCodeGenerationOptions _options; - - public BlazorCodeTarget(RazorCodeGenerationOptions options, IEnumerable extensions) - { - _options = options; - Extensions = extensions.ToArray(); - } - - public ICodeTargetExtension[] Extensions { get; } - - public override IntermediateNodeWriter CreateNodeWriter() - { - return _options.DesignTime ? (BlazorNodeWriter)new BlazorDesignTimeNodeWriter() : new BlazorRuntimeNodeWriter(); - } - - public override TExtension GetExtension() - { - for (var i = 0; i < Extensions.Length; i++) - { - var match = Extensions[i] as TExtension; - if (match != null) - { - return match; - } - } - - return null; - } - - public override bool HasExtension() - { - for (var i = 0; i < Extensions.Length; i++) - { - var match = Extensions[i] as TExtension; - if (match != null) - { - return true; - } - } - - return false; - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDesignTimeNodeWriter.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDesignTimeNodeWriter.cs deleted file mode 100644 index 0f84aeeffa..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDesignTimeNodeWriter.cs +++ /dev/null @@ -1,775 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Extensions; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - // Based on the DesignTimeNodeWriter from Razor repo. - internal class BlazorDesignTimeNodeWriter : BlazorNodeWriter - { - private readonly ScopeStack _scopeStack = new ScopeStack(); - - private static readonly string DesignTimeVariable = "__o"; - - public override void WriteHtmlBlock(CodeRenderingContext context, HtmlBlockIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Do nothing - } - - public override void WriteHtmlElement(CodeRenderingContext context, HtmlElementIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - context.RenderChildren(node); - } - - public override void WriteUsingDirective(CodeRenderingContext context, UsingDirectiveIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - if (node.Source.HasValue) - { - using (context.CodeWriter.BuildLinePragma(node.Source.Value)) - { - context.AddSourceMappingFor(node); - context.CodeWriter.WriteUsing(node.Content); - } - } - else - { - context.CodeWriter.WriteUsing(node.Content); - } - } - - public override void WriteCSharpExpression(CodeRenderingContext context, CSharpExpressionIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - if (node.Children.Count == 0) - { - return; - } - - if (node.Source != null) - { - using (context.CodeWriter.BuildLinePragma(node.Source.Value)) - { - var offset = DesignTimeVariable.Length + " = ".Length; - context.CodeWriter.WritePadding(offset, node.Source, context); - context.CodeWriter.WriteStartAssignment(DesignTimeVariable); - - for (var i = 0; i < node.Children.Count; i++) - { - if (node.Children[i] is IntermediateToken token && token.IsCSharp) - { - context.AddSourceMappingFor(token); - context.CodeWriter.Write(token.Content); - } - else - { - // There may be something else inside the expression like a Template or another extension node. - context.RenderNode(node.Children[i]); - } - } - - context.CodeWriter.WriteLine(";"); - } - } - else - { - context.CodeWriter.WriteStartAssignment(DesignTimeVariable); - for (var i = 0; i < node.Children.Count; i++) - { - if (node.Children[i] is IntermediateToken token && token.IsCSharp) - { - context.CodeWriter.Write(token.Content); - } - else - { - // There may be something else inside the expression like a Template or another extension node. - context.RenderNode(node.Children[i]); - } - } - context.CodeWriter.WriteLine(";"); - } - } - - public override void WriteCSharpCode(CodeRenderingContext context, CSharpCodeIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - var isWhitespaceStatement = true; - for (var i = 0; i < node.Children.Count; i++) - { - var token = node.Children[i] as IntermediateToken; - if (token == null || !string.IsNullOrWhiteSpace(token.Content)) - { - isWhitespaceStatement = false; - break; - } - } - - IDisposable linePragmaScope = null; - if (node.Source != null) - { - if (!isWhitespaceStatement) - { - linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value); - } - - context.CodeWriter.WritePadding(0, node.Source.Value, context); - } - else if (isWhitespaceStatement) - { - // Don't write whitespace if there is no line mapping for it. - return; - } - - for (var i = 0; i < node.Children.Count; i++) - { - if (node.Children[i] is IntermediateToken token && token.IsCSharp) - { - context.AddSourceMappingFor(token); - context.CodeWriter.Write(token.Content); - } - else - { - // There may be something else inside the statement like an extension node. - context.RenderNode(node.Children[i]); - } - } - - if (linePragmaScope != null) - { - linePragmaScope.Dispose(); - } - else - { - context.CodeWriter.WriteLine(); - } - } - - public override void WriteHtmlAttribute(CodeRenderingContext context, HtmlAttributeIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - context.RenderChildren(node); - } - - public override void WriteHtmlAttributeValue(CodeRenderingContext context, HtmlAttributeValueIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Do nothing, this can't contain code. - } - - public override void WriteCSharpExpressionAttributeValue(CodeRenderingContext context, CSharpExpressionAttributeValueIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - if (node.Children.Count == 0) - { - return; - } - - var firstChild = node.Children[0]; - if (firstChild.Source != null) - { - using (context.CodeWriter.BuildLinePragma(firstChild.Source.Value)) - { - var offset = DesignTimeVariable.Length + " = ".Length; - context.CodeWriter.WritePadding(offset, firstChild.Source, context); - context.CodeWriter.WriteStartAssignment(DesignTimeVariable); - - for (var i = 0; i < node.Children.Count; i++) - { - if (node.Children[i] is IntermediateToken token && token.IsCSharp) - { - context.AddSourceMappingFor(token); - context.CodeWriter.Write(token.Content); - } - else - { - // There may be something else inside the expression like a Template or another extension node. - context.RenderNode(node.Children[i]); - } - } - - context.CodeWriter.WriteLine(";"); - } - } - else - { - context.CodeWriter.WriteStartAssignment(DesignTimeVariable); - for (var i = 0; i < node.Children.Count; i++) - { - if (node.Children[i] is IntermediateToken token && token.IsCSharp) - { - if (token.Source != null) - { - context.AddSourceMappingFor(token); - } - - context.CodeWriter.Write(token.Content); - } - else - { - // There may be something else inside the expression like a Template or another extension node. - context.RenderNode(node.Children[i]); - } - } - context.CodeWriter.WriteLine(";"); - } - } - - public override void WriteHtmlContent(CodeRenderingContext context, HtmlContentIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Do nothing - } - - public override void BeginWriteAttribute(CodeWriter codeWriter, string key) - { - if (codeWriter == null) - { - throw new ArgumentNullException(nameof(codeWriter)); - } - - if (key == null) - { - throw new ArgumentNullException(nameof(key)); - } - - codeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddAttribute)}") - .Write("-1") - .WriteParameterSeparator() - .WriteStringLiteral(key) - .WriteParameterSeparator(); - } - - public override void WriteComponent(CodeRenderingContext context, ComponentExtensionNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - if (node.TypeInferenceNode == null) - { - // Writes something like: - // - // builder.OpenComponent(0); - // builder.AddAttribute(1, "Foo", ...); - // builder.AddAttribute(2, "ChildContent", ...); - // builder.AddElementCapture(3, (__value) => _field = __value); - // builder.CloseComponent(); - foreach (var typeArgument in node.TypeArguments) - { - context.RenderNode(typeArgument); - } - - foreach (var attribute in node.Attributes) - { - context.RenderNode(attribute); - } - - if (node.ChildContents.Any()) - { - foreach (var childContent in node.ChildContents) - { - context.RenderNode(childContent); - } - } - else - { - // We eliminate 'empty' child content when building the tree so that usage like - // '\r\n' doesn't create a child content. - // - // Consider what would happen if the user's cursor was inside the element. At - // design -time we want to render an empty lambda to provide proper scoping - // for any code that the user types. - context.RenderNode(new ComponentChildContentIntermediateNode() - { - TypeName = ComponentsApi.RenderFragment.FullTypeName, - }); - } - - foreach (var capture in node.Captures) - { - context.RenderNode(capture); - } - } - else - { - // When we're doing type inference, we can't write all of the code inline to initialize - // the component on the builder. We generate a method elsewhere, and then pass all of the information - // to that method. We pass in all of the attribute values + the sequence numbers. - // - // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, ..., 2, ..., 3, ....); - var attributes = node.Attributes.ToList(); - var childContents = node.ChildContents.ToList(); - var captures = node.Captures.ToList(); - var remaining = attributes.Count + childContents.Count + captures.Count; - - context.CodeWriter.Write(node.TypeInferenceNode.FullTypeName); - context.CodeWriter.Write("."); - context.CodeWriter.Write(node.TypeInferenceNode.MethodName); - context.CodeWriter.Write("("); - - context.CodeWriter.Write(_scopeStack.BuilderVarName); - context.CodeWriter.Write(", "); - - context.CodeWriter.Write("-1"); - context.CodeWriter.Write(", "); - - for (var i = 0; i < attributes.Count; i++) - { - context.CodeWriter.Write("-1"); - context.CodeWriter.Write(", "); - - // Don't type check generics, since we can't actually write the type name. - // The type checking with happen anyway since we defined a method and we're generating - // a call to it. - WriteComponentAttributeInnards(context, attributes[i], canTypeCheck: false); - - remaining--; - if (remaining > 0) - { - context.CodeWriter.Write(", "); - } - } - - for (var i = 0; i < childContents.Count; i++) - { - context.CodeWriter.Write("-1"); - context.CodeWriter.Write(", "); - - WriteComponentChildContentInnards(context, childContents[i]); - - remaining--; - if (remaining > 0) - { - context.CodeWriter.Write(", "); - } - } - - for (var i = 0; i < captures.Count; i++) - { - context.CodeWriter.Write("-1"); - context.CodeWriter.Write(", "); - - WriteReferenceCaptureInnards(context, captures[i], shouldTypeCheck: false); - - remaining--; - if (remaining > 0) - { - context.CodeWriter.Write(", "); - } - } - - context.CodeWriter.Write(");"); - context.CodeWriter.WriteLine(); - } - } - - public override void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeExtensionNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Looks like: - // __o = 17; - context.CodeWriter.Write(DesignTimeVariable); - context.CodeWriter.Write(" = "); - - // Following the same design pattern as the runtime codegen - WriteComponentAttributeInnards(context, node, canTypeCheck: true); - - context.CodeWriter.Write(";"); - context.CodeWriter.WriteLine(); - } - - private void WriteComponentAttributeInnards(CodeRenderingContext context, ComponentAttributeExtensionNode node, bool canTypeCheck) - { - // We limit component attributes to simple cases. However there is still a lot of complexity - // to handle here, since there are a few different cases for how an attribute might be structured. - // - // This roughly follows the design of the runtime writer for simplicity. - if (node.AttributeStructure == AttributeStructure.Minimized) - { - // Minimized attributes always map to 'true' - context.CodeWriter.Write("true"); - } - else if (node.Children.Count > 1) - { - // We don't expect this to happen, we just want to know if it can. - throw new InvalidOperationException("Attribute nodes should either be minimized or a single type of content." + string.Join(", ", node.Children)); - } - else if (node.Children.Count == 1 && node.Children[0] is HtmlContentIntermediateNode) - { - // We don't actually need the content at designtime, an empty string will do. - context.CodeWriter.Write("\"\""); - } - else - { - // There are a few different forms that could be used to contain all of the tokens, but we don't really care - // exactly what it looks like - we just want all of the content. - // - // This can include an empty list in some cases like the following (sic): - // - // - // Of a list of tokens directly in the attribute. - var tokens = GetCSharpTokens(node); - - if ((node.BoundAttribute?.IsDelegateProperty() ?? false) || - (node.BoundAttribute?.IsChildContentProperty() ?? false)) - { - // We always surround the expression with the delegate constructor. This makes type - // inference inside lambdas, and method group conversion do the right thing. - if (canTypeCheck) - { - context.CodeWriter.Write("new "); - context.CodeWriter.Write(node.TypeName); - context.CodeWriter.Write("("); - } - context.CodeWriter.WriteLine(); - - for (var i = 0; i < tokens.Count; i++) - { - WriteCSharpToken(context, tokens[i]); - } - - if (canTypeCheck) - { - context.CodeWriter.Write(")"); - } - } - else - { - // This is the case when an attribute contains C# code - // - // If we have a parameter type, then add a type check. - if (canTypeCheck && NeedsTypeCheck(node)) - { - context.CodeWriter.Write(ComponentsApi.RuntimeHelpers.TypeCheck); - context.CodeWriter.Write("<"); - context.CodeWriter.Write(node.TypeName); - context.CodeWriter.Write(">"); - context.CodeWriter.Write("("); - } - - for (var i = 0; i < tokens.Count; i++) - { - WriteCSharpToken(context, tokens[i]); - } - - if (canTypeCheck && NeedsTypeCheck(node)) - { - context.CodeWriter.Write(")"); - } - } - } - - bool NeedsTypeCheck(ComponentAttributeExtensionNode n) - { - return n.BoundAttribute != null && !n.BoundAttribute.IsWeaklyTyped(); - } - - IReadOnlyList GetCSharpTokens(ComponentAttributeExtensionNode attribute) - { - // We generally expect all children to be CSharp, this is here just in case. - return attribute.FindDescendantNodes().Where(t => t.IsCSharp).ToArray(); - } - } - - public override void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Writes something like: - // - // builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... })); - // OR - // builder.AddAttribute(1, "ChildContent", (RenderFragment)((person) => (__builder73) => { ... })); - BeginWriteAttribute(context.CodeWriter, node.AttributeName); - context.CodeWriter.Write($"({node.TypeName})("); - - WriteComponentChildContentInnards(context, node); - - context.CodeWriter.Write(")"); - context.CodeWriter.WriteEndMethodInvocation(); - } - - private void WriteComponentChildContentInnards(CodeRenderingContext context, ComponentChildContentIntermediateNode node) - { - // Writes something like: - // - // ((__builder73) => { ... }) - // OR - // ((person) => (__builder73) => { }) - _scopeStack.OpenComponentScope( - context, - node.AttributeName, - node.IsParameterized ? node.ParameterName : null); - for (var i = 0; i < node.Children.Count; i++) - { - context.RenderNode(node.Children[i]); - } - _scopeStack.CloseScope(context); - } - - public override void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentExtensionNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // At design type we want write the equivalent of: - // - // __o = typeof(TItem); - context.CodeWriter.Write(DesignTimeVariable); - context.CodeWriter.Write(" = "); - context.CodeWriter.Write("typeof("); - - var tokens = GetCSharpTokens(node); - for (var i = 0; i < tokens.Count; i++) - { - WriteCSharpToken(context, tokens[i]); - } - - context.CodeWriter.Write(");"); - context.CodeWriter.WriteLine(); - - IReadOnlyList GetCSharpTokens(ComponentTypeArgumentExtensionNode arg) - { - // We generally expect all children to be CSharp, this is here just in case. - return arg.FindDescendantNodes().Where(t => t.IsCSharp).ToArray(); - } - } - - public override void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Looks like: - // - // (__builder73) => { ... } - _scopeStack.OpenTemplateScope(context); - context.RenderChildren(node); - _scopeStack.CloseScope(context); - } - - public override void WriteReferenceCapture(CodeRenderingContext context, RefExtensionNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Looks like: - // - // __field = default(MyComponent); - WriteReferenceCaptureInnards(context, node, shouldTypeCheck: true); - } - - protected override void WriteReferenceCaptureInnards(CodeRenderingContext context, RefExtensionNode node, bool shouldTypeCheck) - { - // We specialize this code based on whether or not we can type check. When we're calling into - // a type-inferenced component, we can't do the type check. See the comments in WriteTypeInferenceMethod. - if (shouldTypeCheck) - { - // The runtime node writer moves the call elsewhere. At design time we - // just want sufficiently similar code that any unknown-identifier or type - // errors will be equivalent - var captureTypeName = node.IsComponentCapture - ? node.ComponentCaptureTypeName - : ComponentsApi.ElementRef.FullTypeName; - WriteCSharpCode(context, new CSharpCodeIntermediateNode - { - Source = node.Source, - Children = - { - node.IdentifierToken, - new IntermediateToken - { - Kind = TokenKind.CSharp, - Content = $" = default({captureTypeName});" - } - } - }); - } - else - { - // Looks like: - // - // (__value) = { _field = (MyComponent)__value; } - // OR - // (__value) = { _field = (ElementRef)__value; } - const string refCaptureParamName = "__value"; - using (var lambdaScope = context.CodeWriter.BuildLambda(refCaptureParamName)) - { - WriteCSharpCode(context, new CSharpCodeIntermediateNode - { - Source = node.Source, - Children = - { - node.IdentifierToken, - new IntermediateToken - { - Kind = TokenKind.CSharp, - Content = $" = {refCaptureParamName};" - } - } - }); - } - } - } - - private void WriteCSharpToken(CodeRenderingContext context, IntermediateToken token) - { - if (string.IsNullOrWhiteSpace(token.Content)) - { - return; - } - - if (token.Source?.FilePath == null) - { - context.CodeWriter.Write(token.Content); - return; - } - - using (context.CodeWriter.BuildLinePragma(token.Source)) - { - context.CodeWriter.WritePadding(0, token.Source.Value, context); - context.AddSourceMappingFor(token); - context.CodeWriter.Write(token.Content); - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDiagnosticFactory.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDiagnosticFactory.cs deleted file mode 100644 index c911f98bde..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDiagnosticFactory.cs +++ /dev/null @@ -1,323 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal static class BlazorDiagnosticFactory - { - public static readonly RazorDiagnosticDescriptor CodeBlockInAttribute = - new RazorDiagnosticDescriptor( - "BL9979", - () => - "Code blocks delimited by '@{...}' like '@{{ {0} }}' for attributes are no longer supported " + - "These features have been changed to use attribute syntax. " + - "Use 'attr=\"@(x => {... }\"'.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_CodeBlockInAttribute(SourceSpan? source, string expression) - { - var diagnostic = RazorDiagnostic.Create( - CodeBlockInAttribute, - source ?? SourceSpan.Undefined, - expression); - return diagnostic; - } - - public static readonly RazorDiagnosticDescriptor UnclosedTag = new RazorDiagnosticDescriptor( - "BL9980", - () => "Unclosed tag '{0}' with no matching end tag.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_UnclosedTag(SourceSpan? span, string tagName) - { - return RazorDiagnostic.Create(UnclosedTag, span ?? SourceSpan.Undefined, tagName); - } - - public static readonly RazorDiagnosticDescriptor UnexpectedClosingTag = new RazorDiagnosticDescriptor( - "BL9981", - () => "Unexpected closing tag '{0}' with no matching start tag.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_UnexpectedClosingTag(SourceSpan? span, string tagName) - { - return RazorDiagnostic.Create(UnexpectedClosingTag, span ?? SourceSpan.Undefined, tagName); - } - - public static readonly RazorDiagnosticDescriptor MismatchedClosingTag = new RazorDiagnosticDescriptor( - "BL9982", - () => "Mismatching closing tag. Found '{0}' but expected '{1}'.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_MismatchedClosingTag(SourceSpan? span, string expectedTagName, string tagName) - { - return RazorDiagnostic.Create(MismatchedClosingTag, span ?? SourceSpan.Undefined, expectedTagName, tagName); - } - - public static readonly RazorDiagnosticDescriptor UnexpectedClosingTagForVoidElement = new RazorDiagnosticDescriptor( - "BL9983", - () => "Unexpected closing tag '{0}'. The element '{0}' is a void element, and should be used without a closing tag.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_UnexpectedClosingTagForVoidElement(SourceSpan? span, string tagName) - { - return RazorDiagnostic.Create(UnexpectedClosingTagForVoidElement, span ?? SourceSpan.Undefined, tagName); - } - - public static readonly RazorDiagnosticDescriptor InvalidHtmlContent = new RazorDiagnosticDescriptor( - "BL9984", - () => "Found invalid HTML content. Text '{0}'", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_InvalidHtmlContent(SourceSpan? span, string text) - { - return RazorDiagnostic.Create(InvalidHtmlContent, span ?? SourceSpan.Undefined, text); - } - - public static readonly RazorDiagnosticDescriptor MultipleComponents = new RazorDiagnosticDescriptor( - "BL9985", - () => "Multiple components use the tag '{0}'. Components: {1}", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_MultipleComponents(SourceSpan? span, string tagName, IEnumerable components) - { - return RazorDiagnostic.Create(MultipleComponents, span ?? SourceSpan.Undefined, tagName, string.Join(", ", components.Select(c => c.DisplayName))); - } - - public static readonly RazorDiagnosticDescriptor UnsupportedComplexContent = new RazorDiagnosticDescriptor( - "BL9986", - () => "Component attributes do not support complex content (mixed C# and markup). Attribute: '{0}', text '{1}'", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_UnsupportedComplexContent(IntermediateNode node, string attributeName) - { - var content = string.Join("", node.FindDescendantNodes().Select(t => t.Content)); - return RazorDiagnostic.Create(UnsupportedComplexContent, node.Source ?? SourceSpan.Undefined, attributeName, content); - } - - public static readonly RazorDiagnosticDescriptor PageDirective_CannotBeImported = - new RazorDiagnosticDescriptor( - "BL9987", - () => Resources.PageDirectiveCannotBeImported, - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic CreatePageDirective_CannotBeImported(SourceSpan source) - { - var fileName = Path.GetFileName(source.FilePath); - var diagnostic = RazorDiagnostic.Create(PageDirective_CannotBeImported, source, PageDirective.Directive.Directive, fileName); - - return diagnostic; - } - - public static readonly RazorDiagnosticDescriptor PageDirective_MustSpecifyRoute = - new RazorDiagnosticDescriptor( - "BL9988", - () => "The @page directive must specify a route template. The route template must be enclosed in quotes and begin with the '/' character.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic CreatePageDirective_MustSpecifyRoute(SourceSpan? source) - { - var diagnostic = RazorDiagnostic.Create(PageDirective_MustSpecifyRoute, source ?? SourceSpan.Undefined); - return diagnostic; - } - - public static readonly RazorDiagnosticDescriptor BindAttribute_Duplicates = - new RazorDiagnosticDescriptor( - "BL9989", - () => "The attribute '{0}' was matched by multiple bind attributes. Duplicates:{1}", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic CreateBindAttribute_Duplicates(SourceSpan? source, string attribute, TagHelperPropertyIntermediateNode[] attributes) - { - var diagnostic = RazorDiagnostic.Create( - BindAttribute_Duplicates, - source ?? SourceSpan.Undefined, - attribute, - Environment.NewLine + string.Join(Environment.NewLine, attributes.Select(p => p.TagHelper.DisplayName))); - return diagnostic; - } - - public static readonly RazorDiagnosticDescriptor EventHandler_Duplicates = - new RazorDiagnosticDescriptor( - "BL9990", - () => "The attribute '{0}' was matched by multiple event handlers attributes. Duplicates:{1}", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic CreateEventHandler_Duplicates(SourceSpan? source, string attribute, TagHelperPropertyIntermediateNode[] attributes) - { - var diagnostic = RazorDiagnostic.Create( - EventHandler_Duplicates, - source ?? SourceSpan.Undefined, - attribute, - Environment.NewLine + string.Join(Environment.NewLine, attributes.Select(p => p.TagHelper.DisplayName))); - return diagnostic; - } - - public static readonly RazorDiagnosticDescriptor BindAttribute_InvalidSyntax = - new RazorDiagnosticDescriptor( - "BL9991", - () => "The attribute names could not be inferred from bind attribute '{0}'. Bind attributes should be of the form" + - "'bind', 'bind-value' or 'bind-value-change'", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic CreateBindAttribute_InvalidSyntax(SourceSpan? source, string attribute) - { - var diagnostic = RazorDiagnostic.Create( - BindAttribute_InvalidSyntax, - source ?? SourceSpan.Undefined, - attribute); - return diagnostic; - } - - public static readonly RazorDiagnosticDescriptor DisallowedScriptTag = new RazorDiagnosticDescriptor( - "BL9992", - () => "Script tags should not be placed inside components because they cannot be updated dynamically. To fix this, move the script tag to the 'index.html' file or another static location. For more information see https://go.microsoft.com/fwlink/?linkid=872131", - RazorDiagnosticSeverity.Error); - - // Reserved: BL9993 Component parameters should not be public - - public static RazorDiagnostic Create_DisallowedScriptTag(SourceSpan? source) - { - var diagnostic = RazorDiagnostic.Create(DisallowedScriptTag, source ?? SourceSpan.Undefined); - return diagnostic; - } - - public static readonly RazorDiagnosticDescriptor TemplateInvalidLocation = - new RazorDiagnosticDescriptor( - "BL9994", - () => "Razor templates cannot be used in attributes.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_TemplateInvalidLocation(SourceSpan? source) - { - return RazorDiagnostic.Create(TemplateInvalidLocation, source ?? SourceSpan.Undefined); - } - - public static readonly RazorDiagnosticDescriptor ChildContentSetByAttributeAndBody = - new RazorDiagnosticDescriptor( - "BL9995", - () => "The child content property '{0}' is set by both the attribute and the element contents.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_ChildContentSetByAttributeAndBody(SourceSpan? source, string attribute) - { - return RazorDiagnostic.Create(ChildContentSetByAttributeAndBody, source ?? SourceSpan.Undefined, attribute); - } - - public static readonly RazorDiagnosticDescriptor ChildContentMixedWithExplicitChildContent = - new RazorDiagnosticDescriptor( - "BL9996", - () => "Unrecognized child content inside component '{0}'. The component '{0}' accepts child content through the " + - "following top-level items: {1}.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_ChildContentMixedWithExplicitChildContent(SourceSpan? source, ComponentExtensionNode component) - { - var supportedElements = string.Join(", ", component.Component.GetChildContentProperties().Select(p => $"'{p.Name}'")); - return RazorDiagnostic.Create(ChildContentMixedWithExplicitChildContent, source ?? SourceSpan.Undefined, component.TagName, supportedElements); - } - - public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidAttribute = - new RazorDiagnosticDescriptor( - "BL9997", - () => "Unrecognized attribute '{0}' on child content element '{1}'.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_ChildContentHasInvalidAttribute(SourceSpan? source, string attribute, string element) - { - return RazorDiagnostic.Create(ChildContentHasInvalidAttribute, source ?? SourceSpan.Undefined, attribute, element); - } - - public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidParameter = - new RazorDiagnosticDescriptor( - "BL9998", - () => "Invalid parameter name. The parameter name attribute '{0}' on child content element '{1}' can only include literal text.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_ChildContentHasInvalidParameter(SourceSpan? source, string attribute, string element) - { - return RazorDiagnostic.Create(ChildContentHasInvalidParameter, source ?? SourceSpan.Undefined, attribute, element); - } - - public static readonly RazorDiagnosticDescriptor ChildContentRepeatedParameterName = - new RazorDiagnosticDescriptor( - "BL9999", - () => "The child content element '{0}' of component '{1}' uses the same parameter name ('{2}') as enclosing child content " + - "element '{3}' of component '{4}'. Specify the parameter name like: '<{0} Context=\"another_name\"> to resolve the ambiguity", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_ChildContentRepeatedParameterName( - SourceSpan? source, - ComponentChildContentIntermediateNode childContent1, - ComponentExtensionNode component1, - ComponentChildContentIntermediateNode childContent2, - ComponentExtensionNode component2) - { - Debug.Assert(childContent1.ParameterName == childContent2.ParameterName); - Debug.Assert(childContent1.IsParameterized); - Debug.Assert(childContent2.IsParameterized); - - return RazorDiagnostic.Create( - ChildContentRepeatedParameterName, - source ?? SourceSpan.Undefined, - childContent1.AttributeName, - component1.TagName, - childContent1.ParameterName, - childContent2.AttributeName, - component2.TagName); - } - - public static readonly RazorDiagnosticDescriptor GenericComponentMissingTypeArgument = - new RazorDiagnosticDescriptor( - "BL10000", - () => "The component '{0}' is missing required type arguments. Specify the missing types using the attributes: {1}.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_GenericComponentMissingTypeArgument( - SourceSpan? source, - ComponentExtensionNode component, - IEnumerable attributes) - { - Debug.Assert(component.Component.IsGenericTypedComponent()); - - var attributesText = string.Join(", ", attributes.Select(a => $"'{a.Name}'")); - return RazorDiagnostic.Create(GenericComponentMissingTypeArgument, source ?? SourceSpan.Undefined, component.TagName, attributesText); - } - - public static readonly RazorDiagnosticDescriptor GenericComponentTypeInferenceUnderspecified = - new RazorDiagnosticDescriptor( - "BL10001", - () => "The type of component '{0}' cannot be inferred based on the values provided. Consider specifying the type arguments " + - "directly using the following attributes: {1}.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_GenericComponentTypeInferenceUnderspecified( - SourceSpan? source, - ComponentExtensionNode component, - IEnumerable attributes) - { - Debug.Assert(component.Component.IsGenericTypedComponent()); - - var attributesText = string.Join(", ", attributes.Select(a => $"'{a.Name}'")); - return RazorDiagnostic.Create(GenericComponentTypeInferenceUnderspecified, source ?? SourceSpan.Undefined, component.TagName, attributesText); - } - - public static readonly RazorDiagnosticDescriptor ChildContentHasInvalidParameterOnComponent = - new RazorDiagnosticDescriptor( - "BL10002", - () => "Invalid parameter name. The parameter name attribute '{0}' on component '{1}' can only include literal text.", - RazorDiagnosticSeverity.Error); - - public static RazorDiagnostic Create_ChildContentHasInvalidParameterOnComponent(SourceSpan? source, string attribute, string element) - { - return RazorDiagnostic.Create(ChildContentHasInvalidParameterOnComponent, source ?? SourceSpan.Undefined, attribute, element); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorExtensionInitializer.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorExtensionInitializer.cs deleted file mode 100644 index ff8f8548fc..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorExtensionInitializer.cs +++ /dev/null @@ -1,136 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Extensions; - -namespace Microsoft.AspNetCore.Components.Razor -{ - /// - /// Initializes the Blazor extension. - /// - public class BlazorExtensionInitializer : RazorExtensionInitializer - { - /// - /// Specifies the declaration configuration. - /// - public static readonly RazorConfiguration DeclarationConfiguration; - - /// - /// Specifies the default configuration. - /// - public static readonly RazorConfiguration DefaultConfiguration; - - static BlazorExtensionInitializer() - { - // The configuration names here need to match what we put in the MSBuild configuration - DeclarationConfiguration = RazorConfiguration.Create( - RazorLanguageVersion.Experimental, - "BlazorDeclaration-0.1", - Array.Empty()); - - DefaultConfiguration = RazorConfiguration.Create( - RazorLanguageVersion.Experimental, - "Blazor-0.1", - Array.Empty()); - } - - /// - /// Registers the Blazor extension. - /// - /// The . - public static void Register(RazorProjectEngineBuilder builder) - { - if (builder == null) - { - throw new ArgumentNullException(nameof(builder)); - } - - FunctionsDirective.Register(builder); - ImplementsDirective.Register(builder); - InheritsDirective.Register(builder); - InjectDirective.Register(builder); - LayoutDirective.Register(builder); - PageDirective.Register(builder); - TypeParamDirective.Register(builder); - - builder.Features.Remove(builder.Features.OfType().Single()); - builder.Features.Add(new BlazorImportProjectFeature()); - - var index = builder.Phases.IndexOf(builder.Phases.OfType().Single()); - builder.Phases[index] = new BlazorRazorCSharpLoweringPhase(); - - builder.Features.Add(new ConfigureBlazorCodeGenerationOptions()); - - builder.AddTargetExtension(new BlazorTemplateTargetExtension()); - - var isDeclarationOnlyCompile = builder.Configuration.ConfigurationName == DeclarationConfiguration.ConfigurationName; - - // Blazor-specific passes, in order. - if (!isDeclarationOnlyCompile) - { - // There's no benefit in this optimization during the declaration-only compile - builder.Features.Add(new TrimWhitespacePass()); - } - builder.Features.Add(new ComponentDocumentClassifierPass()); - builder.Features.Add(new ComponentDocumentRewritePass()); - builder.Features.Add(new ScriptTagPass()); - builder.Features.Add(new ComplexAttributeContentPass()); - builder.Features.Add(new ComponentLoweringPass()); - builder.Features.Add(new EventHandlerLoweringPass()); - builder.Features.Add(new RefLoweringPass()); - builder.Features.Add(new BindLoweringPass()); - builder.Features.Add(new TemplateDiagnosticPass()); - builder.Features.Add(new GenericComponentPass()); - builder.Features.Add(new ChildContentDiagnosticPass()); - builder.Features.Add(new HtmlBlockPass()); - - builder.Features.Add(new ComponentTagHelperDescriptorProvider()); - builder.Features.Add(new BindTagHelperDescriptorProvider()); - builder.Features.Add(new EventHandlerTagHelperDescriptorProvider()); - builder.Features.Add(new RefTagHelperDescriptorProvider()); - - if (isDeclarationOnlyCompile) - { - // This is for 'declaration only' processing. We don't want to try and emit any method bodies during - // the design time build because we can't do it correctly until the set of components is known. - builder.Features.Add(new EliminateMethodBodyPass()); - } - } - - /// - /// Initializes the Blazor extension. - /// - /// The . - public override void Initialize(RazorProjectEngineBuilder builder) - { - if (builder == null) - { - throw new ArgumentNullException(nameof(builder)); - } - - Register(builder); - } - - private class ConfigureBlazorCodeGenerationOptions : IConfigureRazorCodeGenerationOptionsFeature - { - public int Order => 0; - - public RazorEngine Engine { get; set; } - - public void Configure(RazorCodeGenerationOptionsBuilder options) - { - if (options == null) - { - throw new ArgumentNullException(nameof(options)); - } - - // These metadata attributes require a reference to the Razor.Runtime package which we don't - // otherwise need. - options.SuppressMetadataAttributes = true; - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorImportProjectFeature.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorImportProjectFeature.cs deleted file mode 100644 index 8aafa5b1dc..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorImportProjectFeature.cs +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class BlazorImportProjectFeature : IImportProjectFeature - { - private const string ImportsFileName = "_ViewImports.cshtml"; - - private static readonly char[] PathSeparators = new char[]{ '/', '\\' }; - - // Using explicit newlines here to avoid fooling our baseline tests - private readonly static string DefaultUsingImportContent = - "\r\n" + - "@using System\r\n" + - "@using System.Collections.Generic\r\n" + - "@using System.Linq\r\n" + - "@using System.Threading.Tasks\r\n" + - "@using " + ComponentsApi.RenderFragment.Namespace + "\r\n"; // Microsoft.AspNetCore.Components - - public RazorProjectEngine ProjectEngine { get; set; } - - public IReadOnlyList GetImports(RazorProjectItem projectItem) - { - if (projectItem == null) - { - throw new ArgumentNullException(nameof(projectItem)); - } - - var imports = new List() - { - new VirtualProjectItem(DefaultUsingImportContent), - new VirtualProjectItem(@"@addTagHelper ""*, Microsoft.AspNetCore.Components"""), - }; - - // Try and infer a namespace from the project directory. We don't yet have the ability to pass - // the namespace through from the project. - if (projectItem.PhysicalPath != null && projectItem.FilePath != null) - { - // Avoiding the path-specific APIs here, we want to handle all styles of paths - // on all platforms - var trimLength = projectItem.FilePath.Length + (projectItem.FilePath.StartsWith("/") ? 0 : 1); - var baseDirectory = projectItem.PhysicalPath.Substring(0, projectItem.PhysicalPath.Length - trimLength); - - var lastSlash = baseDirectory.LastIndexOfAny(PathSeparators); - var baseNamespace = lastSlash == -1 ? baseDirectory : baseDirectory.Substring(lastSlash + 1); - if (!string.IsNullOrEmpty(baseNamespace)) - { - imports.Add(new VirtualProjectItem($@"@addTagHelper ""*, {baseNamespace}""")); - } - } - - // We add hierarchical imports second so any default directive imports can be overridden. - imports.AddRange(GetHierarchicalImports(ProjectEngine.FileSystem, projectItem)); - - return imports; - } - - // Temporary API until we fully convert to RazorProjectEngine - public IEnumerable GetHierarchicalImports(RazorProject project, RazorProjectItem projectItem) - { - // We want items in descending order. FindHierarchicalItems returns items in ascending order. - return project.FindHierarchicalItems(projectItem.FilePath, ImportsFileName).Reverse(); - } - - private class VirtualProjectItem : RazorProjectItem - { - private readonly byte[] _bytes; - - public VirtualProjectItem(string content) - { - var preamble = Encoding.UTF8.GetPreamble(); - var contentBytes = Encoding.UTF8.GetBytes(content); - - _bytes = new byte[preamble.Length + contentBytes.Length]; - preamble.CopyTo(_bytes, 0); - contentBytes.CopyTo(_bytes, preamble.Length); - } - - public override string BasePath => null; - - public override string FilePath => null; - - public override string PhysicalPath => null; - - public override bool Exists => true; - - public override Stream Read() => new MemoryStream(_bytes); - } - } -} \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorMetadata.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorMetadata.cs deleted file mode 100644 index 0c5afc3a54..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorMetadata.cs +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Components.Razor -{ - // Metadata used for Blazor's interactions with the tag helper system - internal static class BlazorMetadata - { - // There's a bug in the 15.7 preview 1 Razor that prevents 'Kind' from being serialized - // this affects both tooling and build. For now our workaround is to ignore 'Kind' and - // use our own metadata entry to denote non-Component tag helpers. - public static readonly string SpecialKindKey = "Blazor.IsSpecialKind"; - - public static class Bind - { - public static readonly string RuntimeName = "Blazor.None"; - - public readonly static string TagHelperKind = "Blazor.Bind"; - - public readonly static string FallbackKey = "Blazor.Bind.Fallback"; - - public readonly static string TypeAttribute = "Blazor.Bind.TypeAttribute"; - - public readonly static string ValueAttribute = "Blazor.Bind.ValueAttribute"; - - public readonly static string ChangeAttribute = "Blazor.Bind.ChangeAttribute"; - } - - public static class ChildContent - { - public static readonly string RuntimeName = "Blazor.None"; - - public static readonly string TagHelperKind = "Blazor.ChildContent"; - - public static readonly string ParameterNameBoundAttributeKind = "Blazor.ChildContentParameterName"; - - /// - /// The name of the synthesized attribute used to set a child content parameter. - /// - public static readonly string ParameterAttributeName = "Context"; - - /// - /// The default name of the child content parameter (unless set by a Context attribute). - /// - public static readonly string DefaultParameterName = "context"; - } - - public static class Component - { - public static readonly string ChildContentKey = "Blazor.ChildContent"; - - public static readonly string ChildContentParameterNameKey = "Blazor.ChildContentParameterName"; - - public static readonly string DelegateSignatureKey = "Blazor.DelegateSignature"; - - public static readonly string WeaklyTypedKey = "Blazor.IsWeaklyTyped"; - - public static readonly string RuntimeName = "Blazor.IComponent"; - - public readonly static string TagHelperKind = "Blazor.Component"; - - public readonly static string GenericTypedKey = "Blazor.GenericTyped"; - - public readonly static string TypeParameterKey = "Blazor.TypeParameter"; - } - - public static class EventHandler - { - public static readonly string EventArgsType = "Blazor.EventHandler.EventArgs"; - - public static readonly string RuntimeName = "Blazor.None"; - - public readonly static string TagHelperKind = "Blazor.EventHandler"; - } - - public static class Ref - { - public readonly static string TagHelperKind = "Blazor.Ref"; - - public static readonly string RuntimeName = "Blazor.None"; - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorNodeWriter.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorNodeWriter.cs deleted file mode 100644 index d5991bd2a5..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorNodeWriter.cs +++ /dev/null @@ -1,218 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Extensions; -using Microsoft.AspNetCore.Razor.Language.Intermediate; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal abstract class BlazorNodeWriter : IntermediateNodeWriter - { - public abstract void BeginWriteAttribute(CodeWriter codeWriter, string key); - - public abstract void WriteComponent(CodeRenderingContext context, ComponentExtensionNode node); - - public abstract void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeExtensionNode node); - - public abstract void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node); - - public abstract void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentExtensionNode node); - - public abstract void WriteHtmlElement(CodeRenderingContext context, HtmlElementIntermediateNode node); - - public abstract void WriteHtmlBlock(CodeRenderingContext context, HtmlBlockIntermediateNode node); - - public abstract void WriteReferenceCapture(CodeRenderingContext context, RefExtensionNode node); - - protected abstract void WriteReferenceCaptureInnards(CodeRenderingContext context, RefExtensionNode node, bool shouldTypeCheck); - - public abstract void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node); - - public sealed override void BeginWriterScope(CodeRenderingContext context, string writer) - { - throw new NotImplementedException(nameof(BeginWriterScope)); - } - - public sealed override void EndWriterScope(CodeRenderingContext context) - { - throw new NotImplementedException(nameof(EndWriterScope)); - } - - public sealed override void WriteCSharpCodeAttributeValue(CodeRenderingContext context, CSharpCodeAttributeValueIntermediateNode node) - { - // We used to support syntaxes like but this is no longer the - // case. - // - // We provide an error for this case just to be friendly. - var content = string.Join("", node.Children.OfType().Select(t => t.Content)); - context.Diagnostics.Add(BlazorDiagnosticFactory.Create_CodeBlockInAttribute(node.Source, content)); - return; - } - - - // Currently the same for design time and runtime - public void WriteComponentTypeInferenceMethod(CodeRenderingContext context, ComponentTypeInferenceMethodIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // This is ugly because CodeWriter doesn't allow us to erase, but we need to comma-delimit. So we have to - // materizalize something can iterate, or use string.Join. We'll need this multiple times, so materializing - // it. - var parameters = GetParameterDeclarations(); - - // This is really similar to the code in WriteComponentAttribute and WriteComponentChildContent - except simpler because - // attributes and child contents look like variables. - // - // Looks like: - // - // public static void CreateFoo_0(RenderTreeBuilder builder, int seq, int __seq0, T1 __arg0, int __seq1, global::System.Collections.Generic.List __arg1, int __seq2, string __arg2) - // { - // builder.OpenComponent>(); - // builder.AddAttribute(__seq0, "Attr0", __arg0); - // builder.AddAttribute(__seq1, "Attr1", __arg1); - // builder.AddAttribute(__seq2, "Attr2", __arg2); - // builder.CloseComponent(); - // } - // - // As a special case, we need to generate a thunk for captures in this block instead of using - // them verbatim. - // - // The problem is that RenderTreeBuilder wants an Action. The caller can't write the type - // name if it contains generics, and we can't write the variable they want to assign to. - var writer = context.CodeWriter; - - writer.Write("public static void "); - writer.Write(node.MethodName); - - writer.Write("<"); - writer.Write(string.Join(", ", node.Component.Component.GetTypeParameters().Select(a => a.Name))); - writer.Write(">"); - - writer.Write("("); - writer.Write("global::"); - writer.Write(ComponentsApi.RenderTreeBuilder.FullTypeName); - writer.Write(" builder"); - writer.Write(", "); - writer.Write("int seq"); - - if (parameters.Count > 0) - { - writer.Write(", "); - } - - for (var i = 0; i < parameters.Count; i++) - { - writer.Write("int "); - writer.Write(parameters[i].seqName); - - writer.Write(", "); - writer.Write(parameters[i].typeName); - writer.Write(" "); - writer.Write(parameters[i].parameterName); - - if (i < parameters.Count - 1) - { - writer.Write(", "); - } - } - - writer.Write(")"); - writer.WriteLine(); - - writer.WriteLine("{"); - - // builder.OpenComponent(42); - context.CodeWriter.Write("builder"); - context.CodeWriter.Write("."); - context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent); - context.CodeWriter.Write("<"); - context.CodeWriter.Write(node.Component.TypeName); - context.CodeWriter.Write(">("); - context.CodeWriter.Write("seq"); - context.CodeWriter.Write(");"); - context.CodeWriter.WriteLine(); - - var index = 0; - foreach (var attribute in node.Component.Attributes) - { - context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute); - context.CodeWriter.Write(parameters[index].seqName); - context.CodeWriter.Write(", "); - - context.CodeWriter.Write($"\"{attribute.AttributeName}\""); - context.CodeWriter.Write(", "); - - context.CodeWriter.Write(parameters[index].parameterName); - context.CodeWriter.WriteEndMethodInvocation(); - - index++; - } - - foreach (var childContent in node.Component.ChildContents) - { - context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute); - context.CodeWriter.Write(parameters[index].seqName); - context.CodeWriter.Write(", "); - - context.CodeWriter.Write($"\"{childContent.AttributeName}\""); - context.CodeWriter.Write(", "); - - context.CodeWriter.Write(parameters[index].parameterName); - context.CodeWriter.WriteEndMethodInvocation(); - - index++; - } - - foreach (var capture in node.Component.Captures) - { - context.CodeWriter.WriteStartInstanceMethodInvocation("builder", capture.IsComponentCapture ? ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture : ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture); - context.CodeWriter.Write(parameters[index].seqName); - context.CodeWriter.Write(", "); - - var cast = capture.IsComponentCapture ? $"({capture.ComponentCaptureTypeName})" : string.Empty; - context.CodeWriter.Write($"(__value) => {{ {parameters[index].parameterName}({cast}__value); }}"); - context.CodeWriter.WriteEndMethodInvocation(); - - index++; - } - - context.CodeWriter.WriteInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.CloseComponent); - - writer.WriteLine("}"); - - List<(string seqName, string typeName, string parameterName)> GetParameterDeclarations() - { - var p = new List<(string seqName, string typeName, string parameterName)>(); - foreach (var attribute in node.Component.Attributes) - { - p.Add(($"__seq{p.Count}", attribute.TypeName, $"__arg{p.Count}")); - } - - foreach (var childContent in node.Component.ChildContents) - { - p.Add(($"__seq{p.Count}", childContent.TypeName, $"__arg{p.Count}")); - } - - foreach (var capture in node.Component.Captures) - { - p.Add(($"__seq{p.Count}", capture.TypeName, $"__arg{p.Count}")); - } - - return p; - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorRuntimeNodeWriter.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorRuntimeNodeWriter.cs deleted file mode 100644 index 3d3ed6c154..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorRuntimeNodeWriter.cs +++ /dev/null @@ -1,766 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Extensions; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - /// - /// Generates the C# code corresponding to Razor source document contents. - /// - internal class BlazorRuntimeNodeWriter : BlazorNodeWriter - { - private readonly List _currentAttributeValues = new List(); - private readonly ScopeStack _scopeStack = new ScopeStack(); - private int _sourceSequence = 0; - - public override void WriteCSharpCode(CodeRenderingContext context, CSharpCodeIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - var isWhitespaceStatement = true; - for (var i = 0; i < node.Children.Count; i++) - { - var token = node.Children[i] as IntermediateToken; - if (token == null || !string.IsNullOrWhiteSpace(token.Content)) - { - isWhitespaceStatement = false; - break; - } - } - - if (isWhitespaceStatement) - { - // The runtime and design time code differ in their handling of whitespace-only - // statements. At runtime we can discard them completely. At design time we need - // to keep them for the editor. - return; - } - - IDisposable linePragmaScope = null; - if (node.Source != null) - { - linePragmaScope = context.CodeWriter.BuildLinePragma(node.Source.Value); - context.CodeWriter.WritePadding(0, node.Source.Value, context); - } - - for (var i = 0; i < node.Children.Count; i++) - { - if (node.Children[i] is IntermediateToken token && token.IsCSharp) - { - context.AddSourceMappingFor(token); - context.CodeWriter.Write(token.Content); - } - else - { - // There may be something else inside the statement like an extension node. - context.RenderNode(node.Children[i]); - } - } - - if (linePragmaScope != null) - { - linePragmaScope.Dispose(); - } - else - { - context.CodeWriter.WriteLine(); - } - } - - public override void WriteCSharpExpression(CodeRenderingContext context, CSharpExpressionIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Since we're not in the middle of writing an element, this must evaluate as some - // text to display - context.CodeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddContent)}") - .Write((_sourceSequence++).ToString()) - .WriteParameterSeparator(); - - for (var i = 0; i < node.Children.Count; i++) - { - if (node.Children[i] is IntermediateToken token && token.IsCSharp) - { - context.CodeWriter.Write(token.Content); - } - else - { - // There may be something else inside the expression like a Template or another extension node. - context.RenderNode(node.Children[i]); - } - } - - context.CodeWriter.WriteEndMethodInvocation(); - } - - public override void WriteCSharpExpressionAttributeValue(CodeRenderingContext context, CSharpExpressionAttributeValueIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // In cases like "somestring @variable", Razor tokenizes it as: - // [0] HtmlContent="somestring" - // [1] CsharpContent="variable" Prefix=" " - // ... so to avoid losing whitespace, convert the prefix to a further token in the list - if (!string.IsNullOrEmpty(node.Prefix)) - { - _currentAttributeValues.Add(new IntermediateToken() { Kind = TokenKind.Html, Content = node.Prefix }); - } - - for (var i = 0; i < node.Children.Count; i++) - { - _currentAttributeValues.Add((IntermediateToken)node.Children[i]); - } - } - - public override void WriteHtmlBlock(CodeRenderingContext context, HtmlBlockIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - context.CodeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddMarkupContent)}") - .Write((_sourceSequence++).ToString()) - .WriteParameterSeparator() - .WriteStringLiteral(node.Content) - .WriteEndMethodInvocation(); - } - - public override void WriteHtmlElement(CodeRenderingContext context, HtmlElementIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - context.CodeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.OpenElement)}") - .Write((_sourceSequence++).ToString()) - .WriteParameterSeparator() - .WriteStringLiteral(node.TagName) - .WriteEndMethodInvocation(); - - // Render Attributes before creating the scope. - foreach (var attribute in node.Attributes) - { - context.RenderNode(attribute); - } - - foreach (var capture in node.Captures) - { - context.RenderNode(capture); - } - - // Render body of the tag inside the scope - foreach (var child in node.Body) - { - context.RenderNode(child); - } - - context.CodeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.CloseElement}") - .WriteEndMethodInvocation(); - } - - public override void WriteHtmlAttribute(CodeRenderingContext context, HtmlAttributeIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - Debug.Assert(_currentAttributeValues.Count == 0); - context.RenderChildren(node); - - WriteAttribute(context.CodeWriter, node.AttributeName, _currentAttributeValues); - _currentAttributeValues.Clear(); - } - - public override void WriteHtmlAttributeValue(CodeRenderingContext context, HtmlAttributeValueIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - var stringContent = ((IntermediateToken)node.Children.Single()).Content; - _currentAttributeValues.Add(new IntermediateToken() { Kind = TokenKind.Html, Content = node.Prefix + stringContent, }); - } - - public override void WriteHtmlContent(CodeRenderingContext context, HtmlContentIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Text node - var content = GetHtmlContent(node); - context.CodeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddContent)}") - .Write((_sourceSequence++).ToString()) - .WriteParameterSeparator() - .WriteStringLiteral(content) - .WriteEndMethodInvocation(); - } - - public override void WriteUsingDirective(CodeRenderingContext context, UsingDirectiveIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - context.CodeWriter.WriteUsing(node.Content, endLine: true); - } - - public override void WriteComponent(CodeRenderingContext context, ComponentExtensionNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - if (node.TypeInferenceNode == null) - { - // If the component is using not using type inference then we just write an open/close with a series - // of add attribute calls in between. - // - // Writes something like: - // - // builder.OpenComponent(0); - // builder.AddAttribute(1, "Foo", ...); - // builder.AddAttribute(2, "ChildContent", ...); - // builder.AddElementCapture(3, (__value) => _field = __value); - // builder.CloseComponent(); - - // builder.OpenComponent(42); - context.CodeWriter.Write(_scopeStack.BuilderVarName); - context.CodeWriter.Write("."); - context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent); - context.CodeWriter.Write("<"); - context.CodeWriter.Write(node.TypeName); - context.CodeWriter.Write(">("); - context.CodeWriter.Write((_sourceSequence++).ToString()); - context.CodeWriter.Write(");"); - context.CodeWriter.WriteLine(); - - // We can skip type arguments during runtime codegen, they are handled in the - // type/parameter declarations. - - foreach (var attribute in node.Attributes) - { - context.RenderNode(attribute); - } - - foreach (var childContent in node.ChildContents) - { - context.RenderNode(childContent); - } - - foreach (var capture in node.Captures) - { - context.RenderNode(capture); - } - - // builder.CloseComponent(); - context.CodeWriter.Write(_scopeStack.BuilderVarName); - context.CodeWriter.Write("."); - context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.CloseComponent); - context.CodeWriter.Write("();"); - context.CodeWriter.WriteLine(); - } - else - { - // When we're doing type inference, we can't write all of the code inline to initialize - // the component on the builder. We generate a method elsewhere, and then pass all of the information - // to that method. We pass in all of the attribute values + the sequence numbers. - // - // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, ..., 2, ..., 3, ...); - var attributes = node.Attributes.ToList(); - var childContents = node.ChildContents.ToList(); - var captures = node.Captures.ToList(); - var remaining = attributes.Count + childContents.Count + captures.Count; - - context.CodeWriter.Write(node.TypeInferenceNode.FullTypeName); - context.CodeWriter.Write("."); - context.CodeWriter.Write(node.TypeInferenceNode.MethodName); - context.CodeWriter.Write("("); - - context.CodeWriter.Write(_scopeStack.BuilderVarName); - context.CodeWriter.Write(", "); - - context.CodeWriter.Write((_sourceSequence++).ToString()); - context.CodeWriter.Write(", "); - - for (var i = 0; i < attributes.Count; i++) - { - context.CodeWriter.Write((_sourceSequence++).ToString()); - context.CodeWriter.Write(", "); - - // Don't type check generics, since we can't actually write the type name. - // The type checking with happen anyway since we defined a method and we're generating - // a call to it. - WriteComponentAttributeInnards(context, attributes[i], canTypeCheck: false); - - remaining--; - if (remaining > 0) - { - context.CodeWriter.Write(", "); - } - } - - for (var i = 0; i < childContents.Count; i++) - { - context.CodeWriter.Write((_sourceSequence++).ToString()); - context.CodeWriter.Write(", "); - - WriteComponentChildContentInnards(context, childContents[i]); - - remaining--; - if (remaining > 0) - { - context.CodeWriter.Write(", "); - } - } - - for (var i = 0; i < captures.Count; i++) - { - context.CodeWriter.Write((_sourceSequence++).ToString()); - context.CodeWriter.Write(", "); - - WriteReferenceCaptureInnards(context, captures[i], shouldTypeCheck: false); - - remaining--; - if (remaining > 0) - { - context.CodeWriter.Write(", "); - } - } - - context.CodeWriter.Write(");"); - context.CodeWriter.WriteLine(); - } - } - - public override void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeExtensionNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // builder.AddAttribute(1, "Foo", 42); - context.CodeWriter.Write(_scopeStack.BuilderVarName); - context.CodeWriter.Write("."); - context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.AddAttribute); - context.CodeWriter.Write("("); - context.CodeWriter.Write((_sourceSequence++).ToString()); - context.CodeWriter.Write(", "); - context.CodeWriter.WriteStringLiteral(node.AttributeName); - context.CodeWriter.Write(", "); - - WriteComponentAttributeInnards(context, node, canTypeCheck: true); - - context.CodeWriter.Write(");"); - context.CodeWriter.WriteLine(); - } - - private void WriteComponentAttributeInnards(CodeRenderingContext context, ComponentAttributeExtensionNode node, bool canTypeCheck) - { - if (node.AttributeStructure == AttributeStructure.Minimized) - { - // Minimized attributes always map to 'true' - context.CodeWriter.Write("true"); - } - else if (node.Children.Count > 1) - { - // We don't expect this to happen, we just want to know if it can. - throw new InvalidOperationException("Attribute nodes should either be minimized or a single type of content." + string.Join(", ", node.Children)); - } - else if (node.Children.Count == 1 && node.Children[0] is HtmlContentIntermediateNode htmlNode) - { - // This is how string attributes are lowered by default, a single HTML node with a single HTML token. - var content = string.Join(string.Empty, GetHtmlTokens(htmlNode).Select(t => t.Content)); - context.CodeWriter.WriteStringLiteral(content); - } - else - { - // See comments in BlazorDesignTimeNodeWriter for a description of the cases that are possible. - var tokens = GetCSharpTokens(node); - if ((node.BoundAttribute?.IsDelegateProperty() ?? false) || - (node.BoundAttribute?.IsChildContentProperty() ?? false)) - { - if (canTypeCheck) - { - context.CodeWriter.Write("new "); - context.CodeWriter.Write(node.TypeName); - context.CodeWriter.Write("("); - } - - for (var i = 0; i < tokens.Count; i++) - { - context.CodeWriter.Write(tokens[i].Content); - } - - if (canTypeCheck) - { - context.CodeWriter.Write(")"); - } - } - else - { - if (canTypeCheck && NeedsTypeCheck(node)) - { - context.CodeWriter.Write(ComponentsApi.RuntimeHelpers.TypeCheck); - context.CodeWriter.Write("<"); - context.CodeWriter.Write(node.TypeName); - context.CodeWriter.Write(">"); - context.CodeWriter.Write("("); - } - - for (var i = 0; i < tokens.Count; i++) - { - context.CodeWriter.Write(tokens[i].Content); - } - - if (canTypeCheck && NeedsTypeCheck(node)) - { - context.CodeWriter.Write(")"); - } - } - } - - IReadOnlyList GetCSharpTokens(ComponentAttributeExtensionNode attribute) - { - // We generally expect all children to be CSharp, this is here just in case. - return attribute.FindDescendantNodes().Where(t => t.IsCSharp).ToArray(); - } - - IReadOnlyList GetHtmlTokens(HtmlContentIntermediateNode html) - { - // We generally expect all children to be HTML, this is here just in case. - return html.FindDescendantNodes().Where(t => t.IsHtml).ToArray(); - } - - bool NeedsTypeCheck(ComponentAttributeExtensionNode n) - { - return node.BoundAttribute != null && !node.BoundAttribute.IsWeaklyTyped(); - } - } - - public override void WriteComponentChildContent(CodeRenderingContext context, ComponentChildContentIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Writes something like: - // - // builder.AddAttribute(1, "ChildContent", (RenderFragment)((__builder73) => { ... })); - // OR - // builder.AddAttribute(1, "ChildContent", (RenderFragment)((person) => (__builder73) => { ... })); - BeginWriteAttribute(context.CodeWriter, node.AttributeName); - context.CodeWriter.Write($"({node.TypeName})("); - - WriteComponentChildContentInnards(context, node); - - context.CodeWriter.Write(")"); - context.CodeWriter.WriteEndMethodInvocation(); - } - - private void WriteComponentChildContentInnards(CodeRenderingContext context, ComponentChildContentIntermediateNode node) - { - // Writes something like: - // - // ((__builder73) => { ... }) - // OR - // ((person) => (__builder73) => { }) - _scopeStack.OpenComponentScope( - context, - node.AttributeName, - node.IsParameterized ? node.ParameterName : null); - for (var i = 0; i < node.Children.Count; i++) - { - context.RenderNode(node.Children[i]); - } - _scopeStack.CloseScope(context); - } - - public override void WriteComponentTypeArgument(CodeRenderingContext context, ComponentTypeArgumentExtensionNode node) - { - // We can skip type arguments during runtime codegen, they are handled in the - // type/parameter declarations. - } - - public override void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - if (node == null) - { - throw new ArgumentNullException(nameof(node)); - } - - // Looks like: - // - // (__builder73) => { ... } - _scopeStack.OpenTemplateScope(context); - context.RenderChildren(node); - _scopeStack.CloseScope(context); - } - - public override void WriteReferenceCapture(CodeRenderingContext context, RefExtensionNode node) - { - // Looks like: - // - // builder.AddComponentReferenceCapture(2, (__value) = { _field = (MyComponent)__value; }); - // OR - // builder.AddElementReferenceCapture(2, (__value) = { _field = (ElementRef)__value; }); - var codeWriter = context.CodeWriter; - - var methodName = node.IsComponentCapture - ? nameof(ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture) - : nameof(ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture); - codeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{methodName}") - .Write((_sourceSequence++).ToString()) - .WriteParameterSeparator(); - - WriteReferenceCaptureInnards(context, node, shouldTypeCheck: true); - - codeWriter.WriteEndMethodInvocation(); - } - - protected override void WriteReferenceCaptureInnards(CodeRenderingContext context, RefExtensionNode node, bool shouldTypeCheck) - { - // Looks like: - // - // (__value) = { _field = (MyComponent)__value; } - // OR - // (__value) = { _field = (ElementRef)__value; } - const string refCaptureParamName = "__value"; - using (var lambdaScope = context.CodeWriter.BuildLambda(refCaptureParamName)) - { - var typecastIfNeeded = shouldTypeCheck && node.IsComponentCapture ? $"({node.ComponentCaptureTypeName})" : string.Empty; - WriteCSharpCode(context, new CSharpCodeIntermediateNode - { - Source = node.Source, - Children = - { - node.IdentifierToken, - new IntermediateToken - { - Kind = TokenKind.CSharp, - Content = $" = {typecastIfNeeded}{refCaptureParamName};" - } - } - }); - } - } - - private void WriteAttribute(CodeWriter codeWriter, string key, IList value) - { - BeginWriteAttribute(codeWriter, key); - WriteAttributeValue(codeWriter, value); - codeWriter.WriteEndMethodInvocation(); - } - - public override void BeginWriteAttribute(CodeWriter codeWriter, string key) - { - codeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddAttribute)}") - .Write((_sourceSequence++).ToString()) - .WriteParameterSeparator() - .WriteStringLiteral(key) - .WriteParameterSeparator(); - } - - private static string GetHtmlContent(HtmlContentIntermediateNode node) - { - var builder = new StringBuilder(); - var htmlTokens = node.Children.OfType().Where(t => t.IsHtml); - foreach (var htmlToken in htmlTokens) - { - builder.Append(htmlToken.Content); - } - return builder.ToString(); - } - - // There are a few cases here, we need to handle: - // - Pure HTML - // - Pure CSharp - // - Mixed HTML and CSharp - // - // Only the mixed case is complicated, we want to turn it into code that will concatenate - // the values into a string at runtime. - - private static void WriteAttributeValue(CodeWriter writer, IList tokens) - { - if (tokens == null) - { - throw new ArgumentNullException(nameof(tokens)); - } - - var hasHtml = false; - var hasCSharp = false; - for (var i = 0; i < tokens.Count; i++) - { - if (tokens[i].IsCSharp) - { - hasCSharp |= true; - } - else - { - hasHtml |= true; - } - } - - if (hasHtml && hasCSharp) - { - // If it's a C# expression, we have to wrap it in parens, otherwise things like ternary - // expressions don't compose with concatenation. However, this is a little complicated - // because C# tokens themselves aren't guaranteed to be distinct expressions. We want - // to treat all contiguous C# tokens as a single expression. - var insideCSharp = false; - for (var i = 0; i < tokens.Count; i++) - { - var token = tokens[i]; - if (token.IsCSharp) - { - if (!insideCSharp) - { - if (i != 0) - { - writer.Write(" + "); - } - - writer.Write("("); - insideCSharp = true; - } - - writer.Write(token.Content); - } - else - { - if (insideCSharp) - { - writer.Write(")"); - insideCSharp = false; - } - - if (i != 0) - { - writer.Write(" + "); - } - - writer.WriteStringLiteral(token.Content); - } - } - - if (insideCSharp) - { - writer.Write(")"); - } - } - else if (hasCSharp) - { - writer.Write(string.Join("", tokens.Select(t => t.Content))); - } - else if (hasHtml) - { - writer.WriteStringLiteral(string.Join("", tokens.Select(t => t.Content))); - } - else - { - // Minimized attributes always map to 'true' - writer.Write("true"); - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorTemplateTargetExtension.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorTemplateTargetExtension.cs deleted file mode 100644 index 287ca46dc0..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorTemplateTargetExtension.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Extensions; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class BlazorTemplateTargetExtension : ITemplateTargetExtension - { - public void WriteTemplate(CodeRenderingContext context, TemplateIntermediateNode node) - { - ((BlazorNodeWriter)context.NodeWriter).WriteTemplate(context, node); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/CSharpIdentifier.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/CSharpIdentifier.cs deleted file mode 100644 index a24206108e..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/CSharpIdentifier.cs +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Globalization; -using System.Text; - -namespace Microsoft.AspNetCore.Components.Razor -{ - // Copied from the Razor repo - internal static class CSharpIdentifier - { - private const string CshtmlExtension = ".cshtml"; - - public static string GetClassNameFromPath(string path) - { - if (string.IsNullOrEmpty(path)) - { - return path; - } - - if (path.EndsWith(CshtmlExtension, StringComparison.OrdinalIgnoreCase)) - { - path = path.Substring(0, path.Length - CshtmlExtension.Length); - } - - return SanitizeClassName(path); - } - - // CSharp Spec §2.4.2 - private static bool IsIdentifierStart(char character) - { - return char.IsLetter(character) || - character == '_' || - CharUnicodeInfo.GetUnicodeCategory(character) == UnicodeCategory.LetterNumber; - } - - public static bool IsIdentifierPart(char character) - { - return char.IsDigit(character) || - IsIdentifierStart(character) || - IsIdentifierPartByUnicodeCategory(character); - } - - private static bool IsIdentifierPartByUnicodeCategory(char character) - { - var category = CharUnicodeInfo.GetUnicodeCategory(character); - - return category == UnicodeCategory.NonSpacingMark || // Mn - category == UnicodeCategory.SpacingCombiningMark || // Mc - category == UnicodeCategory.ConnectorPunctuation || // Pc - category == UnicodeCategory.Format; // Cf - } - - public static string SanitizeClassName(string inputName) - { - if (!IsIdentifierStart(inputName[0]) && IsIdentifierPart(inputName[0])) - { - inputName = "_" + inputName; - } - - var builder = new StringBuilder(inputName.Length); - for (var i = 0; i < inputName.Length; i++) - { - var ch = inputName[i]; - builder.Append(IsIdentifierPart(ch) ? ch : '_'); - } - - return builder.ToString(); - } - } -} \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ChildContentDiagnosticPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ChildContentDiagnosticPass.cs deleted file mode 100644 index 5d85308eb8..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ChildContentDiagnosticPass.cs +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class ChildContentDiagnosticPass : IntermediateNodePassBase, IRazorOptimizationPass - { - // Runs after components/eventhandlers/ref/bind/templates. We want to validate every component - // and it's usage of ChildContent. - public override int Order => 160; - - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - var visitor = new Visitor(); - visitor.Visit(documentNode); - } - - private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor, IExtensionIntermediateNodeVisitor - { - public void VisitExtension(ComponentExtensionNode node) - { - // Check for properties that are set by both element contents (body) and the attribute itself. - foreach (var childContent in node.ChildContents) - { - foreach (var attribute in node.Attributes) - { - if (attribute.AttributeName == childContent.AttributeName) - { - node.Diagnostics.Add(BlazorDiagnosticFactory.Create_ChildContentSetByAttributeAndBody( - attribute.Source, - attribute.AttributeName)); - } - } - } - - base.VisitDefault(node); - } - - public void VisitExtension(ComponentChildContentIntermediateNode node) - { - // Check that each child content has a unique parameter name within its scope. This is important - // because the parameter name can be implicit, and it doesn't work well when nested. - if (node.IsParameterized) - { - for (var i = 0; i < Ancestors.Count - 1; i++) - { - var ancestor = Ancestors[i] as ComponentChildContentIntermediateNode; - if (ancestor != null && - ancestor.IsParameterized && - string.Equals(node.ParameterName, ancestor.ParameterName, StringComparison.Ordinal)) - { - // Duplicate name. We report an error because this will almost certainly also lead to an error - // from the C# compiler that's way less clear. - node.Diagnostics.Add(BlazorDiagnosticFactory.Create_ChildContentRepeatedParameterName( - node.Source, - node, - (ComponentExtensionNode)Ancestors[0], // Enclosing component - ancestor, // conflicting child content node - (ComponentExtensionNode)Ancestors[i + 1])); // Enclosing component of conflicting child content node - } - } - } - - base.VisitDefault(node); - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/CodeWriterExtensions.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/CodeWriterExtensions.cs deleted file mode 100644 index ac02f126c7..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/CodeWriterExtensions.cs +++ /dev/null @@ -1,647 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Globalization; -using System.Linq; - -// Copied directly from https://github.com/aspnet/Razor/blob/ff40124594b58b17988d50841175430a4b73d1a9/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeWriterExtensions.cs -// (other than the namespace change) because it's internal - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal static class CodeWriterExtensions - { - private const string InstanceMethodFormat = "{0}.{1}"; - - private static readonly char[] CStyleStringLiteralEscapeChars = - { - '\r', - '\t', - '\"', - '\'', - '\\', - '\0', - '\n', - '\u2028', - '\u2029', - }; - - public static bool IsAtBeginningOfLine(this CodeWriter writer) - { - return writer.Length == 0 || writer[writer.Length - 1] == '\n'; - } - - public static CodeWriter WritePadding(this CodeWriter writer, int offset, SourceSpan? span, CodeRenderingContext context) - { - if (span == null) - { - return writer; - } - - var basePadding = CalculatePadding(); - var resolvedPadding = Math.Max(basePadding - offset, 0); - - if (context.Options.IndentWithTabs) - { - // Avoid writing directly to the StringBuilder here, that will throw off the manual indexing - // done by the base class. - var tabs = resolvedPadding / context.Options.IndentSize; - for (var i = 0; i < tabs; i++) - { - writer.Write("\t"); - } - - var spaces = resolvedPadding % context.Options.IndentSize; - for (var i = 0; i < spaces; i++) - { - writer.Write(" "); - } - } - else - { - for (var i = 0; i < resolvedPadding; i++) - { - writer.Write(" "); - } - } - - return writer; - - int CalculatePadding() - { - var spaceCount = 0; - for (var i = span.Value.AbsoluteIndex - 1; i >= 0; i--) - { - var @char = context.SourceDocument[i]; - if (@char == '\n' || @char == '\r') - { - break; - } - else if (@char == '\t') - { - spaceCount += context.Options.IndentSize; - } - else - { - spaceCount++; - } - } - - return spaceCount; - } - } - - public static CodeWriter WriteVariableDeclaration(this CodeWriter writer, string type, string name, string value) - { - writer.Write(type).Write(" ").Write(name); - if (!string.IsNullOrEmpty(value)) - { - writer.Write(" = ").Write(value); - } - else - { - writer.Write(" = null"); - } - - writer.WriteLine(";"); - - return writer; - } - - public static CodeWriter WriteBooleanLiteral(this CodeWriter writer, bool value) - { - return writer.Write(value.ToString().ToLowerInvariant()); - } - - public static CodeWriter WriteStartAssignment(this CodeWriter writer, string name) - { - return writer.Write(name).Write(" = "); - } - - public static CodeWriter WriteParameterSeparator(this CodeWriter writer) - { - return writer.Write(", "); - } - - public static CodeWriter WriteStartNewObject(this CodeWriter writer, string typeName) - { - return writer.Write("new ").Write(typeName).Write("("); - } - - public static CodeWriter WriteStringLiteral(this CodeWriter writer, string literal) - { - if (literal.Length >= 256 && literal.Length <= 1500 && literal.IndexOf('\0') == -1) - { - WriteVerbatimStringLiteral(writer, literal); - } - else - { - WriteCStyleStringLiteral(writer, literal); - } - - return writer; - } - - public static CodeWriter WriteUsing(this CodeWriter writer, string name) - { - return WriteUsing(writer, name, endLine: true); - } - - public static CodeWriter WriteUsing(this CodeWriter writer, string name, bool endLine) - { - writer.Write("using "); - writer.Write(name); - - if (endLine) - { - writer.WriteLine(";"); - } - - return writer; - } - - public static CodeWriter WriteLineNumberDirective(this CodeWriter writer, SourceSpan span) - { - if (writer.Length >= writer.NewLine.Length && !IsAtBeginningOfLine(writer)) - { - writer.WriteLine(); - } - - var lineNumberAsString = (span.LineIndex + 1).ToString(CultureInfo.InvariantCulture); - return writer.Write("#line ").Write(lineNumberAsString).Write(" \"").Write(span.FilePath).WriteLine("\""); - } - - public static CodeWriter WriteStartMethodInvocation(this CodeWriter writer, string methodName) - { - writer.Write(methodName); - - return writer.Write("("); - } - - public static CodeWriter WriteEndMethodInvocation(this CodeWriter writer) - { - return WriteEndMethodInvocation(writer, endLine: true); - } - - public static CodeWriter WriteEndMethodInvocation(this CodeWriter writer, bool endLine) - { - writer.Write(")"); - if (endLine) - { - writer.WriteLine(";"); - } - - return writer; - } - - // Writes a method invocation for the given instance name. - public static CodeWriter WriteInstanceMethodInvocation( - this CodeWriter writer, - string instanceName, - string methodName, - params string[] parameters) - { - if (instanceName == null) - { - throw new ArgumentNullException(nameof(instanceName)); - } - - if (methodName == null) - { - throw new ArgumentNullException(nameof(methodName)); - } - - return WriteInstanceMethodInvocation(writer, instanceName, methodName, endLine: true, parameters: parameters); - } - - // Writes a method invocation for the given instance name. - public static CodeWriter WriteInstanceMethodInvocation( - this CodeWriter writer, - string instanceName, - string methodName, - bool endLine, - params string[] parameters) - { - if (instanceName == null) - { - throw new ArgumentNullException(nameof(instanceName)); - } - - if (methodName == null) - { - throw new ArgumentNullException(nameof(methodName)); - } - - return WriteMethodInvocation( - writer, - string.Format(CultureInfo.InvariantCulture, InstanceMethodFormat, instanceName, methodName), - endLine, - parameters); - } - - public static CodeWriter WriteStartInstanceMethodInvocation(this CodeWriter writer, string instanceName, string methodName) - { - if (instanceName == null) - { - throw new ArgumentNullException(nameof(instanceName)); - } - - if (methodName == null) - { - throw new ArgumentNullException(nameof(methodName)); - } - - return WriteStartMethodInvocation( - writer, - string.Format(CultureInfo.InvariantCulture, InstanceMethodFormat, instanceName, methodName)); - } - - public static CodeWriter WriteField(this CodeWriter writer, IList modifiers, string typeName, string fieldName) - { - if (modifiers == null) - { - throw new ArgumentNullException(nameof(modifiers)); - } - - if (typeName == null) - { - throw new ArgumentNullException(nameof(typeName)); - } - - if (fieldName == null) - { - throw new ArgumentNullException(nameof(fieldName)); - } - - for (var i = 0; i < modifiers.Count; i++) - { - writer.Write(modifiers[i]); - writer.Write(" "); - } - - writer.Write(typeName); - writer.Write(" "); - writer.Write(fieldName); - writer.Write(";"); - writer.WriteLine(); - - return writer; - } - - public static CodeWriter WriteMethodInvocation(this CodeWriter writer, string methodName, params string[] parameters) - { - return WriteMethodInvocation(writer, methodName, endLine: true, parameters: parameters); - } - - public static CodeWriter WriteMethodInvocation(this CodeWriter writer, string methodName, bool endLine, params string[] parameters) - { - return - WriteStartMethodInvocation(writer, methodName) - .Write(string.Join(", ", parameters)) - .WriteEndMethodInvocation(endLine); - } - - public static CodeWriter WriteAutoPropertyDeclaration(this CodeWriter writer, IList modifiers, string typeName, string propertyName) - { - if (modifiers == null) - { - throw new ArgumentNullException(nameof(modifiers)); - } - - if (typeName == null) - { - throw new ArgumentNullException(nameof(typeName)); - } - - if (propertyName == null) - { - throw new ArgumentNullException(nameof(propertyName)); - } - - for (var i = 0; i < modifiers.Count; i++) - { - writer.Write(modifiers[i]); - writer.Write(" "); - } - - writer.Write(typeName); - writer.Write(" "); - writer.Write(propertyName); - writer.Write(" { get; set; }"); - writer.WriteLine(); - - return writer; - } - - public static CSharpCodeWritingScope BuildScope(this CodeWriter writer) - { - return new CSharpCodeWritingScope(writer); - } - - public static CSharpCodeWritingScope BuildLambda(this CodeWriter writer, params string[] parameterNames) - { - return BuildLambda(writer, async: false, parameterNames: parameterNames); - } - - public static CSharpCodeWritingScope BuildAsyncLambda(this CodeWriter writer, params string[] parameterNames) - { - return BuildLambda(writer, async: true, parameterNames: parameterNames); - } - - private static CSharpCodeWritingScope BuildLambda(CodeWriter writer, bool async, string[] parameterNames) - { - if (async) - { - writer.Write("async"); - } - - writer.Write("(").Write(string.Join(", ", parameterNames)).Write(") => "); - - var scope = new CSharpCodeWritingScope(writer); - - return scope; - } - - public static CSharpCodeWritingScope BuildNamespace(this CodeWriter writer, string name) - { - writer.Write("namespace ").WriteLine(name); - - return new CSharpCodeWritingScope(writer); - } - - public static CSharpCodeWritingScope BuildClassDeclaration( - this CodeWriter writer, - IList modifiers, - string name, - string baseType, - IEnumerable interfaces) - { - for (var i = 0; i < modifiers.Count; i++) - { - writer.Write(modifiers[i]); - writer.Write(" "); - } - - writer.Write("class "); - writer.Write(name); - - var hasBaseType = !string.IsNullOrEmpty(baseType); - var hasInterfaces = interfaces != null && interfaces.Count() > 0; - - if (hasBaseType || hasInterfaces) - { - writer.Write(" : "); - - if (hasBaseType) - { - writer.Write(baseType); - - if (hasInterfaces) - { - WriteParameterSeparator(writer); - } - } - - if (hasInterfaces) - { - writer.Write(string.Join(", ", interfaces)); - } - } - - writer.WriteLine(); - - return new CSharpCodeWritingScope(writer); - } - - public static CSharpCodeWritingScope BuildMethodDeclaration( - this CodeWriter writer, - string accessibility, - string returnType, - string name, - IEnumerable> parameters) - { - writer.Write(accessibility) - .Write(" ") - .Write(returnType) - .Write(" ") - .Write(name) - .Write("(") - .Write(string.Join(", ", parameters.Select(p => p.Key + " " + p.Value))) - .WriteLine(")"); - - return new CSharpCodeWritingScope(writer); - } - - public static IDisposable BuildLinePragma(this CodeWriter writer, SourceSpan? span) - { - if (string.IsNullOrEmpty(span?.FilePath)) - { - // Can't build a valid line pragma without a file path. - return NullDisposable.Default; - } - - return new LinePragmaWriter(writer, span.Value); - } - - private static void WriteVerbatimStringLiteral(CodeWriter writer, string literal) - { - writer.Write("@\""); - - // We need to suppress indenting during the writing of the string's content. A - // verbatim string literal could contain newlines that don't get escaped. - var indent = writer.CurrentIndent; - writer.CurrentIndent = 0; - - // We need to find the index of each '"' (double-quote) to escape it. - var start = 0; - int end; - while ((end = literal.IndexOf('\"', start)) > -1) - { - writer.Write(literal, start, end - start); - - writer.Write("\"\""); - - start = end + 1; - } - - Debug.Assert(end == -1); // We've hit all of the double-quotes. - - // Write the remainder after the last double-quote. - writer.Write(literal, start, literal.Length - start); - - writer.Write("\""); - - writer.CurrentIndent = indent; - } - - private static void WriteCStyleStringLiteral(CodeWriter writer, string literal) - { - // From CSharpCodeGenerator.QuoteSnippetStringCStyle in CodeDOM - writer.Write("\""); - - // We need to find the index of each escapable character to escape it. - var start = 0; - int end; - while ((end = literal.IndexOfAny(CStyleStringLiteralEscapeChars, start)) > -1) - { - writer.Write(literal, start, end - start); - - switch (literal[end]) - { - case '\r': - writer.Write("\\r"); - break; - case '\t': - writer.Write("\\t"); - break; - case '\"': - writer.Write("\\\""); - break; - case '\'': - writer.Write("\\\'"); - break; - case '\\': - writer.Write("\\\\"); - break; - case '\0': - writer.Write("\\\0"); - break; - case '\n': - writer.Write("\\n"); - break; - case '\u2028': - case '\u2029': - writer.Write("\\u"); - writer.Write(((int)literal[end]).ToString("X4", CultureInfo.InvariantCulture)); - break; - default: - Debug.Assert(false, "Unknown escape character."); - break; - } - - start = end + 1; - } - - Debug.Assert(end == -1); // We've hit all of chars that need escaping. - - // Write the remainder after the last escaped char. - writer.Write(literal, start, literal.Length - start); - - writer.Write("\""); - } - - public struct CSharpCodeWritingScope : IDisposable - { - private CodeWriter _writer; - private bool _autoSpace; - private int _tabSize; - private int _startIndent; - - public CSharpCodeWritingScope(CodeWriter writer, int tabSize = 4, bool autoSpace = true) - { - _writer = writer; - _autoSpace = autoSpace; - _tabSize = tabSize; - _startIndent = -1; // Set in WriteStartScope - - WriteStartScope(); - } - - public void Dispose() - { - WriteEndScope(); - } - - private void WriteStartScope() - { - TryAutoSpace(" "); - - _writer.WriteLine("{"); - _writer.CurrentIndent += _tabSize; - _startIndent = _writer.CurrentIndent; - } - - private void WriteEndScope() - { - TryAutoSpace(_writer.NewLine); - - // Ensure the scope hasn't been modified - if (_writer.CurrentIndent == _startIndent) - { - _writer.CurrentIndent -= _tabSize; - } - - _writer.WriteLine("}"); - } - - private void TryAutoSpace(string spaceCharacter) - { - if (_autoSpace && - _writer.Length > 0 && - !char.IsWhiteSpace(_writer[_writer.Length - 1])) - { - _writer.Write(spaceCharacter); - } - } - } - - private class LinePragmaWriter : IDisposable - { - private readonly CodeWriter _writer; - private readonly int _startIndent; - - public LinePragmaWriter(CodeWriter writer, SourceSpan span) - { - if (writer == null) - { - throw new ArgumentNullException(nameof(writer)); - } - - _writer = writer; - _startIndent = _writer.CurrentIndent; - _writer.CurrentIndent = 0; - WriteLineNumberDirective(writer, span); - } - - public void Dispose() - { - // Need to add an additional line at the end IF there wasn't one already written. - // This is needed to work with the C# editor's handling of #line ... - var endsWithNewline = _writer.Length > 0 && _writer[_writer.Length - 1] == '\n'; - - // Always write at least 1 empty line to potentially separate code from pragmas. - _writer.WriteLine(); - - // Check if the previous empty line wasn't enough to separate code from pragmas. - if (!endsWithNewline) - { - _writer.WriteLine(); - } - - _writer - .WriteLine("#line default") - .WriteLine("#line hidden"); - - _writer.CurrentIndent = _startIndent; - } - } - - private class NullDisposable : IDisposable - { - public static readonly NullDisposable Default = new NullDisposable(); - - private NullDisposable() - { - } - - public void Dispose() - { - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComplexAttributeContentPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComplexAttributeContentPass.cs deleted file mode 100644 index bd858e2c16..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComplexAttributeContentPass.cs +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Linq; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - // We don't support 'complex' content for components (mixed C# and markup) right now. - // It's not clear yet if Blazor will have a good scenario to use these constructs. - // - // This is where a lot of the complexity in the Razor/TagHelpers model creeps in and we - // might be able to avoid it if these features aren't needed. - internal class ComplexAttributeContentPass : IntermediateNodePassBase, IRazorOptimizationPass - { - // Run before other Blazor passes - public override int Order => -1000; - - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - var nodes = documentNode.FindDescendantNodes(); - for (var i = 0; i < nodes.Count; i++) - { - ProcessAttributes(nodes[i]); - } - } - - private void ProcessAttributes(TagHelperIntermediateNode node) - { - for (var i = node.Children.Count - 1; i >= 0; i--) - { - if (node.Children[i] is TagHelperPropertyIntermediateNode propertyNode) - { - if (TrySimplifyContent(propertyNode) && node.TagHelpers.Any(t => t.IsComponentTagHelper())) - { - node.Diagnostics.Add(BlazorDiagnosticFactory.Create_UnsupportedComplexContent( - propertyNode, - propertyNode.AttributeName)); - node.Children.RemoveAt(i); - continue; - } - } - else if (node.Children[i] is TagHelperHtmlAttributeIntermediateNode htmlNode) - { - if (TrySimplifyContent(htmlNode) && node.TagHelpers.Any(t => t.IsComponentTagHelper())) - { - node.Diagnostics.Add(BlazorDiagnosticFactory.Create_UnsupportedComplexContent( - htmlNode, - htmlNode.AttributeName)); - node.Children.RemoveAt(i); - continue; - } - } - } - } - - private static bool TrySimplifyContent(IntermediateNode node) - { - if (node.Children.Count == 1 && - node.Children[0] is HtmlAttributeIntermediateNode htmlNode && - htmlNode.Children.Count > 1) - { - // This case can be hit for a 'string' attribute - return true; - } - else if (node.Children.Count == 1 && - node.Children[0] is CSharpExpressionIntermediateNode cSharpNode && - cSharpNode.Children.Count > 1) - { - // This case can be hit when the attribute has an explicit @ inside, which - // 'escapes' any special sugar we provide for codegen. - // - // There's a special case here for explicit expressions. See https://github.com/aspnet/Razor/issues/2203 - // handling this case as a tactical matter since it's important for lambdas. - if (cSharpNode.Children.Count == 3 && - cSharpNode.Children[0] is IntermediateToken token0 && - cSharpNode.Children[2] is IntermediateToken token2 && - token0.Content == "(" && - token2.Content == ")") - { - cSharpNode.Children.RemoveAt(2); - cSharpNode.Children.RemoveAt(0); - - // We were able to simplify it, all good. - return false; - } - - return true; - } - else if (node.Children.Count == 1 && - node.Children[0] is CSharpCodeIntermediateNode cSharpCodeNode) - { - // This is the case when an attribute contains a code block @{ ... } - // We don't support this. - return true; - } - else if (node.Children.Count > 1) - { - // This is the common case for 'mixed' content - return true; - } - - return false; - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentAttributeExtensionNode.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentAttributeExtensionNode.cs deleted file mode 100644 index 2419cfada6..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentAttributeExtensionNode.cs +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class ComponentAttributeExtensionNode : ExtensionIntermediateNode - { - public ComponentAttributeExtensionNode() - { - } - - public ComponentAttributeExtensionNode(TagHelperHtmlAttributeIntermediateNode attributeNode) - { - if (attributeNode == null) - { - throw new ArgumentNullException(nameof(attributeNode)); - } - - AttributeName = attributeNode.AttributeName; - AttributeStructure = attributeNode.AttributeStructure; - Source = attributeNode.Source; - - for (var i = 0; i < attributeNode.Children.Count; i++) - { - Children.Add(attributeNode.Children[i]); - } - - for (var i = 0; i < attributeNode.Diagnostics.Count; i++) - { - Diagnostics.Add(attributeNode.Diagnostics[i]); - } - } - - public ComponentAttributeExtensionNode(TagHelperPropertyIntermediateNode propertyNode) - { - if (propertyNode == null) - { - throw new ArgumentNullException(nameof(propertyNode)); - } - - AttributeName = propertyNode.AttributeName; - AttributeStructure = propertyNode.AttributeStructure; - BoundAttribute = propertyNode.BoundAttribute; - PropertyName = propertyNode.BoundAttribute.GetPropertyName(); - Source = propertyNode.Source; - TagHelper = propertyNode.TagHelper; - TypeName = propertyNode.BoundAttribute.IsWeaklyTyped() ? null : propertyNode.BoundAttribute.TypeName; - - for (var i = 0; i < propertyNode.Children.Count; i++) - { - Children.Add(propertyNode.Children[i]); - } - - for (var i = 0; i < propertyNode.Diagnostics.Count; i++) - { - Diagnostics.Add(propertyNode.Diagnostics[i]); - } - } - - public ComponentAttributeExtensionNode(ComponentAttributeExtensionNode attributeNode) - { - if (attributeNode == null) - { - throw new ArgumentNullException(nameof(attributeNode)); - } - - AttributeName = attributeNode.AttributeName; - AttributeStructure = attributeNode.AttributeStructure; - BoundAttribute = attributeNode.BoundAttribute; - PropertyName = attributeNode.BoundAttribute.GetPropertyName(); - Source = attributeNode.Source; - TagHelper = attributeNode.TagHelper; - TypeName = attributeNode.BoundAttribute.IsWeaklyTyped() ? null : attributeNode.BoundAttribute.TypeName; - - for (var i = 0; i < attributeNode.Children.Count; i++) - { - Children.Add(attributeNode.Children[i]); - } - - for (var i = 0; i < attributeNode.Diagnostics.Count; i++) - { - Diagnostics.Add(attributeNode.Diagnostics[i]); - } - } - - public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection(); - - public string AttributeName { get; set; } - - public AttributeStructure AttributeStructure { get; set; } - - public BoundAttributeDescriptor BoundAttribute { get; set; } - - public string PropertyName { get; set; } - - public TagHelperDescriptor TagHelper { get; set; } - - public string TypeName { get; set; } - - public override void Accept(IntermediateNodeVisitor visitor) - { - if (visitor == null) - { - throw new ArgumentNullException(nameof(visitor)); - } - - AcceptExtensionNode(this, visitor); - } - - public override void WriteNode(CodeTarget target, CodeRenderingContext context) - { - if (target == null) - { - throw new ArgumentNullException(nameof(target)); - } - - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - var writer = (BlazorNodeWriter)context.NodeWriter; - writer.WriteComponentAttribute(context, this); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentChildContentIntermediateNode.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentChildContentIntermediateNode.cs deleted file mode 100644 index cebcbc8e63..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentChildContentIntermediateNode.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class ComponentChildContentIntermediateNode : ExtensionIntermediateNode - { - public string AttributeName => BoundAttribute?.Name ?? ComponentsApi.RenderTreeBuilder.ChildContent; - - public BoundAttributeDescriptor BoundAttribute { get; set; } - - public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection(); - - public bool IsParameterized => BoundAttribute?.IsParameterizedChildContentProperty() ?? false; - - public string ParameterName { get; set; } - - public string TypeName { get; set; } - - public override void Accept(IntermediateNodeVisitor visitor) - { - if (visitor == null) - { - throw new ArgumentNullException(nameof(visitor)); - } - - AcceptExtensionNode(this, visitor); - } - - public override void WriteNode(CodeTarget target, CodeRenderingContext context) - { - if (target == null) - { - throw new ArgumentNullException(nameof(target)); - } - - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - var writer = (BlazorNodeWriter)context.NodeWriter; - writer.WriteComponentChildContent(context, this); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentClassifierPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentClassifierPass.cs deleted file mode 100644 index 38a9005957..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentClassifierPass.cs +++ /dev/null @@ -1,208 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - /// - /// A that recognizes Blazor components. - /// - public class ComponentDocumentClassifierPass : DocumentClassifierPassBase, IRazorDocumentClassifierPass - { - /// - /// The component document kind. - /// - public static readonly string ComponentDocumentKind = "Blazor.Component"; - - private static readonly object BuildRenderTreeBaseCallAnnotation = new object(); - - private static readonly char[] PathSeparators = new char[] { '/', '\\' }; - - private static readonly char[] NamespaceSeparators = new char[] { '.' }; - - /// - /// The base namespace. - /// - // This is a fallback value and will only be used if we can't compute - // a reasonable namespace. - public string BaseNamespace { get; set; } = "__BlazorGenerated"; - - /// - /// Gets or sets whether to mangle class names. - /// - /// Set to true in the IDE so we can generated mangled class names. This is needed - /// to avoid conflicts between generated design-time code and the code in the editor. - /// - /// A better workaround for this would be to create a singlefilegenerator that overrides - /// the codegen process when a document is open, but this is more involved, so hacking - /// it for now. - /// - public bool MangleClassNames { get; set; } = false; - - internal static bool IsBuildRenderTreeBaseCall(CSharpCodeIntermediateNode node) - => node.Annotations[BuildRenderTreeBaseCallAnnotation] != null; - - /// - protected override string DocumentKind => ComponentDocumentKind; - - /// - protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - // Treat everything as a component by default if Blazor is part of the configuration. - return true; - } - - /// - protected override void OnDocumentStructureCreated( - RazorCodeDocument codeDocument, - NamespaceDeclarationIntermediateNode @namespace, - ClassDeclarationIntermediateNode @class, - MethodDeclarationIntermediateNode method) - { - if (!TryComputeNamespaceAndClass( - codeDocument.Source.FilePath, - codeDocument.Source.RelativePath, - out var computedNamespace, - out var computedClass)) - { - // If we can't compute a nice namespace (no relative path) then just generate something - // mangled. - computedNamespace = BaseNamespace; - computedClass = CSharpIdentifier.GetClassNameFromPath(codeDocument.Source.FilePath) ?? "__BlazorComponent"; - } - - if (MangleClassNames) - { - computedClass = "__" + computedClass; - } - - @namespace.Content = computedNamespace; - - @class.BaseType = ComponentsApi.ComponentBase.FullTypeName; - @class.ClassName = computedClass; - @class.Modifiers.Clear(); - @class.Modifiers.Add("public"); - - var documentNode = codeDocument.GetDocumentIntermediateNode(); - var typeParamReferences = documentNode.FindDirectiveReferences(TypeParamDirective.Directive); - for (var i = 0; i < typeParamReferences.Count; i++) - { - var typeParamNode = (DirectiveIntermediateNode)typeParamReferences[i].Node; - if (typeParamNode.HasDiagnostics) - { - continue; - } - - @class.TypeParameters.Add(new TypeParameter() { ParameterName = typeParamNode.Tokens.First().Content, }); - } - - method.ReturnType = "void"; - method.MethodName = ComponentsApi.ComponentBase.BuildRenderTree; - method.Modifiers.Clear(); - method.Modifiers.Add("protected"); - method.Modifiers.Add("override"); - - method.Parameters.Clear(); - method.Parameters.Add(new MethodParameter() - { - ParameterName = "builder", - TypeName = ComponentsApi.RenderTreeBuilder.FullTypeName, - }); - - // We need to call the 'base' method as the first statement. - var callBase = new CSharpCodeIntermediateNode(); - callBase.Annotations.Add(BuildRenderTreeBaseCallAnnotation, true); - callBase.Children.Add(new IntermediateToken - { - Kind = TokenKind.CSharp, - Content = $"base.{ComponentsApi.ComponentBase.BuildRenderTree}(builder);" - }); - method.Children.Insert(0, callBase); - } - - // In general documents will have a relative path (relative to the project root). - // We can only really compute a nice class/namespace when we know a relative path. - // - // However all kinds of thing are possible in tools. We shouldn't barf here if the document isn't - // set up correctly. - private bool TryComputeNamespaceAndClass(string filePath, string relativePath, out string @namespace, out string @class) - { - if (filePath == null || relativePath == null || filePath.Length <= relativePath.Length) - { - @namespace = null; - @class = null; - return false; - } - - // Try and infer a namespace from the project directory. We don't yet have the ability to pass - // the namespace through from the project. - var trimLength = relativePath.Length + (relativePath.StartsWith("/") ? 0 : 1); - var baseDirectory = filePath.Substring(0, filePath.Length - trimLength); - - var lastSlash = baseDirectory.LastIndexOfAny(PathSeparators); - var baseNamespace = lastSlash == -1 ? baseDirectory : baseDirectory.Substring(lastSlash + 1); - if (string.IsNullOrEmpty(baseNamespace)) - { - @namespace = null; - @class = null; - return false; - } - - var builder = new StringBuilder(); - - // Sanitize the base namespace, but leave the dots. - var segments = baseNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries); - builder.Append(CSharpIdentifier.SanitizeClassName(segments[0])); - for (var i = 1; i < segments.Length; i++) - { - builder.Append('.'); - builder.Append(CSharpIdentifier.SanitizeClassName(segments[i])); - } - - segments = relativePath.Split(PathSeparators, StringSplitOptions.RemoveEmptyEntries); - - // Skip the last segment because it's the FileName. - for (var i = 0; i < segments.Length - 1; i++) - { - builder.Append('.'); - builder.Append(CSharpIdentifier.SanitizeClassName(segments[i])); - } - - @namespace = builder.ToString(); - @class = CSharpIdentifier.SanitizeClassName(Path.GetFileNameWithoutExtension(relativePath)); - - return true; - } - - #region Workaround - // This is a workaround for the fact that the base class doesn't provide good support - // for replacing the IntermediateNodeWriter when building the code target. - void IRazorDocumentClassifierPass.Execute(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - base.Execute(codeDocument, documentNode); - documentNode.Target = new BlazorCodeTarget(documentNode.Options, _targetExtensions); - } - - /// - protected override void OnInitialized() - { - base.OnInitialized(); - - var feature = Engine.Features.OfType(); - _targetExtensions = feature.FirstOrDefault()?.TargetExtensions.ToArray() ?? EmptyExtensionArray; - } - - private static readonly ICodeTargetExtension[] EmptyExtensionArray = new ICodeTargetExtension[0]; - private ICodeTargetExtension[] _targetExtensions; - #endregion - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentRewritePass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentRewritePass.cs deleted file mode 100644 index 96edcbf29c..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentRewritePass.cs +++ /dev/null @@ -1,533 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using AngleSharp; -using AngleSharp.Extensions; -using AngleSharp.Html; -using AngleSharp.Parser.Html; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; - -namespace Microsoft.AspNetCore.Components.Razor -{ - // Rewrites the standard IR to a format more suitable for Blazor - // - // HTML nodes are rewritten to contain more structure, instead of treating HTML as opaque content - // it is structured into element/component nodes, and attribute nodes. - internal class ComponentDocumentRewritePass : IntermediateNodePassBase, IRazorDocumentClassifierPass - { - // Per the HTML spec, the following elements are inherently self-closing - // For example, is the same as (and therefore it cannot contain descendants) - public static readonly HashSet VoidElements = new HashSet(StringComparer.OrdinalIgnoreCase) - { - "area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta", "param", "source", "track", "wbr", - }; - - // Run as soon as possible after the Component document classifier - public override int Order => ComponentDocumentClassifierPass.DefaultFeatureOrder + 1; - - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - if (documentNode.DocumentKind != ComponentDocumentClassifierPass.ComponentDocumentKind) - { - return; - } - - var visitor = new RewriteWalker(codeDocument.Source); - visitor.Visit(documentNode); - } - - // Visits nodes then rewrites them using a post-order traversal. The result is that the tree - // is rewritten bottom up. - // - // This relies on a few invariants Razor already provides for correctness. - // - Tag Helpers are the only real nesting construct - // - Tag Helpers require properly nested HTML inside their body - // - // This means that when we find a 'container' for HTML content, we have the guarantee - // that the content is properly nested, except at the top level of scope. And since the top - // level isn't nested inside anything, we can't introduce any errors due to misunderstanding - // the structure. - private class RewriteWalker : IntermediateNodeWalker - { - private readonly RazorSourceDocument _source; - - public RewriteWalker(RazorSourceDocument source) - { - _source = source; - } - - public override void VisitDefault(IntermediateNode node) - { - var foundHtml = false; - for (var i = 0; i < node.Children.Count; i++) - { - var child = node.Children[i]; - Visit(child); - - if (child is HtmlContentIntermediateNode) - { - foundHtml = true; - } - } - - if (foundHtml) - { - RewriteChildren(_source, node); - } - } - - public override void VisitHtmlAttribute(HtmlAttributeIntermediateNode node) - { - // Don't rewrite inside of attributes - } - - public override void VisitTagHelperHtmlAttribute(TagHelperHtmlAttributeIntermediateNode node) - { - // Don't rewrite inside of attributes - } - - public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node) - { - // Don't rewrite inside of attributes - } - - private void RewriteChildren(RazorSourceDocument source, IntermediateNode node) - { - // We expect all of the immediate children of a node (together) to comprise - // a well-formed tree of elements and components. - var stack = new Stack(); - stack.Push(node); - - // Make a copy, we will clear and rebuild the child collection of this node. - var children = node.Children.ToArray(); - node.Children.Clear(); - - // Due to the way Anglesharp parses HTML (tags at a time) we need to keep track of some state. - // This handles cases like: - // - // - // - // This will lower like: - // - // HtmlContent - // - // We need to consume HTML until we see the 'end tag' for and then we can - // the attributes from the parsed HTML and the CSharpAttribute value. - var parser = new HtmlParser(source); - var attributes = new List(); - - for (var i = 0; i < children.Length; i++) - { - if (children[i] is HtmlContentIntermediateNode htmlNode) - { - parser.Push(htmlNode); - var tokens = parser.Get(); - foreach (var token in tokens) - { - // We have to call this before get. Anglesharp doesn't return the start position - // of tokens. - var start = parser.GetCurrentLocation(); - - // We have to set the Location explicitly otherwise we would need to include - // the token in every call to the parser. - parser.SetLocation(token); - - var end = parser.GetCurrentLocation(); - - if (token.Type == HtmlTokenType.EndOfFile) - { - break; - } - - switch (token.Type) - { - case HtmlTokenType.Doctype: - { - // DocType isn't meaningful in Blazor. We don't process them in the runtime - // it wouldn't really mean much anyway since we build a DOM directly rather - // than letting the user-agent parse the document. - // - // For now, and similar things will just be skipped by the compiler - // unless we come up with something more meaningful to do. - break; - } - - case HtmlTokenType.Character: - { - // Text content - var span = new SourceSpan(start, end.AbsoluteIndex - start.AbsoluteIndex); - stack.Peek().Children.Add(new HtmlContentIntermediateNode() - { - Children = - { - new IntermediateToken() - { - Content = token.Data, - Kind = TokenKind.Html, - Source = span, - } - }, - Source = span, - }); - break; - } - - case HtmlTokenType.StartTag: - { - var tag = token.AsTag(); - - if (token.Type == HtmlTokenType.StartTag) - { - var elementNode = new HtmlElementIntermediateNode() - { - TagName = parser.GetTagNameOriginalCasing(tag), - Source = new SourceSpan(start, end.AbsoluteIndex - start.AbsoluteIndex), - }; - - stack.Peek().Children.Add(elementNode); - stack.Push(elementNode); - - for (var j = 0; j < tag.Attributes.Count; j++) - { - // Unfortunately Anglesharp doesn't provide positions for attributes - // so we can't record the spans here. - var attribute = tag.Attributes[j]; - stack.Peek().Children.Add(CreateAttributeNode(attribute)); - } - - for (var j = 0; j < attributes.Count; j++) - { - stack.Peek().Children.Add(attributes[j]); - } - attributes.Clear(); - } - - if (tag.IsSelfClosing || VoidElements.Contains(tag.Data)) - { - // We can't possibly hit an error here since we just added an element node. - stack.Pop(); - } - - break; - } - - case HtmlTokenType.EndTag: - { - var tag = token.AsTag(); - - var popped = stack.Pop(); - if (stack.Count == 0) - { - // If we managed to 'bottom out' the stack then we have an unbalanced end tag. - // Put back the current node so we don't crash. - stack.Push(popped); - - var tagName = parser.GetTagNameOriginalCasing(tag); - var span = new SourceSpan(start, end.AbsoluteIndex - start.AbsoluteIndex); - - var diagnostic = VoidElements.Contains(tagName) - ? BlazorDiagnosticFactory.Create_UnexpectedClosingTagForVoidElement(span, tagName) - : BlazorDiagnosticFactory.Create_UnexpectedClosingTag(span, tagName); - popped.Children.Add(new HtmlElementIntermediateNode() - { - Diagnostics = - { - diagnostic, - }, - TagName = tagName, - Source = span, - }); - } - else if (!string.Equals(tag.Name, ((HtmlElementIntermediateNode)popped).TagName, StringComparison.OrdinalIgnoreCase)) - { - var span = new SourceSpan(start, end.AbsoluteIndex - start.AbsoluteIndex); - var diagnostic = BlazorDiagnosticFactory.Create_MismatchedClosingTag(span, ((HtmlElementIntermediateNode)popped).TagName, token.Data); - popped.Diagnostics.Add(diagnostic); - } - else - { - // Happy path. - // - // We need to compute a new source span because when we found the start tag before we knew - // the end position of the tag. - var length = end.AbsoluteIndex - popped.Source.Value.AbsoluteIndex; - popped.Source = new SourceSpan( - popped.Source.Value.FilePath, - popped.Source.Value.AbsoluteIndex, - popped.Source.Value.LineIndex, - popped.Source.Value.CharacterIndex, - length); - } - - break; - } - - case HtmlTokenType.Comment: - break; - - default: - throw new InvalidCastException($"Unsupported token type: {token.Type.ToString()}"); - } - } - } - else if (children[i] is HtmlAttributeIntermediateNode htmlAttribute) - { - // Buffer the attribute for now, it will get written out as part of a tag. - attributes.Add(htmlAttribute); - } - else - { - // not HTML, or already rewritten. - stack.Peek().Children.Add(children[i]); - } - } - - var extraContent = parser.GetUnparsedContent(); - if (!string.IsNullOrEmpty(extraContent)) - { - // extra HTML - almost certainly invalid because it couldn't be parsed. - var start = parser.GetCurrentLocation(); - var end = parser.GetCurrentLocation(extraContent.Length); - var span = new SourceSpan(start, end.AbsoluteIndex - start.AbsoluteIndex); - stack.Peek().Children.Add(new HtmlContentIntermediateNode() - { - Children = - { - new IntermediateToken() - { - Content = extraContent, - Kind = TokenKind.Html, - Source = span, - } - }, - Diagnostics = - { - BlazorDiagnosticFactory.Create_InvalidHtmlContent(span, extraContent), - }, - Source = span, - }); - } - - while (stack.Count > 1) - { - // not balanced - var popped = (HtmlElementIntermediateNode)stack.Pop(); - var diagnostic = BlazorDiagnosticFactory.Create_UnclosedTag(popped.Source, popped.TagName); - popped.Diagnostics.Add(diagnostic); - } - } - } - - private static HtmlAttributeIntermediateNode CreateAttributeNode(KeyValuePair attribute) - { - return new HtmlAttributeIntermediateNode() - { - AttributeName = attribute.Key, - Children = - { - new HtmlAttributeValueIntermediateNode() - { - Children = - { - new IntermediateToken() - { - Kind = TokenKind.Html, - Content = attribute.Value, - }, - } - }, - } - }; - } - - private static string GetHtmlContent(HtmlContentIntermediateNode node) - { - var builder = new StringBuilder(); - for (var i = 0; i < node.Children.Count; i++) - { - var token = node.Children[i] as IntermediateToken; - if (token != null && token.IsHtml) - { - builder.Append(token.Content); - } - } - - return builder.ToString(); - } - - [DebuggerDisplay("{DebuggerDisplay,nq}")] - private class HtmlParser - { - private readonly RazorSourceDocument _source; - - // Tracks the offsets between the start of _content and then original source document. - private List<(int offset, int sourceOffset)> _offsets; - private TextSource _textSource; - private int _position; - private string _content; - - public HtmlParser(RazorSourceDocument source) - { - _source = source; - } - - public void Push(HtmlContentIntermediateNode node) - { - var builder = new StringBuilder(); - - var offsets = new List<(int offset, int sourceOffset)>(); - - if (_content != null && _position < _content.Length) - { - offsets.Add((0, _offsets[0].sourceOffset + _position)); - builder.Append(_content, _position, _content.Length - _position); - } - - for (var i = 0; i < node.Children.Count; i++) - { - var token = node.Children[i] as IntermediateToken; - if (token != null && token.IsHtml) - { - offsets.Add((builder.Length, token.Source.Value.AbsoluteIndex)); - builder.Append(token.Content); - } - } - - _content = builder.ToString(); - _offsets = offsets; - _textSource = new TextSource(_content); - _position = 0; - } - - public string GetUnparsedContent() - { - return _position >= _content.Length ? string.Empty : _content.Substring(_position); - } - - public IEnumerable Get() - { - if (_textSource == null) - { - throw new InvalidOperationException("You need to call Push first."); - } - - // This will decode any HTML entities into their textual equivalent. - // - // This is OK because an HtmlContent node is used with document.createTextNode - // in the DOM, which can accept content that has decoded entities. - // - // In the event that we merge HtmlContent into an HtmlBlock, we need to - // re-encode the entities. That's done in the HtmlBlock pass. - var tokens = _textSource.Tokenize(HtmlEntityService.Resolver); - return tokens; - } - - public void SetLocation(HtmlToken token) - { - // The tokenizer will advance to the end when you have an unclosed tag. - // We don't want this, we want to resume before the unclosed tag. - if (token.Type != HtmlTokenType.EndOfFile) - { - _position = _textSource.Index; - } - } - - public SourceLocation GetCurrentLocation(int offset = 0) - { - var absoluteIndex = GetAbsoluteIndex(_position + offset); - - int lineIndex = -1; - int columnIndex = -1; - var remaining = absoluteIndex; - for (var i = 0; i < _source.Lines.Count; i++) - { - var lineLength = _source.Lines.GetLineLength(i); - if (lineLength > remaining) - { - lineIndex = i; - columnIndex = remaining; - break; - } - - remaining -= lineLength; - } - - return new SourceLocation(_source.FilePath, absoluteIndex, lineIndex, columnIndex); - } - - public SourceSpan GetSpan(HtmlToken token) - { - var absoluteIndex = GetAbsoluteIndex(token.Position.Position); - - int lineIndex = -1; - int columnIndex = -1; - var remaining = absoluteIndex; - for (var i = 0; i < _source.Lines.Count; i++) - { - var lineLength = _source.Lines.GetLineLength(i); - if (lineLength > remaining) - { - lineIndex = i; - columnIndex = remaining; - break; - } - - remaining -= lineLength; - } - - var length = GetAbsoluteIndex(_position) - absoluteIndex; - return new SourceSpan(_source.FilePath, absoluteIndex, lineIndex, columnIndex, length); - } - - private int GetAbsoluteIndex(int contentIndex) - { - for (var i = _offsets.Count - 1; i >= 0; i--) - { - if (_offsets[i].offset <= contentIndex) - { - return _offsets[i].sourceOffset + (contentIndex - _offsets[i].offset); - } - } - - throw new InvalidOperationException("Unexpected index value."); - } - - // Anglesharp canonicalizes the case of tags, we want what the user typed. - public string GetTagNameOriginalCasing(HtmlTagToken tag) - { - var offset = tag.Type == HtmlTokenType.EndTag ? 1 : 0; // For end tags, skip the '/' - return tag.Name; - } - - private string DebuggerDisplay - { - get - { - if (_content == null) - { - return "Content={}"; - } - - var builder = new StringBuilder(); - builder.Append("Content="); - builder.Append("{"); - builder.Append(_content.Substring(0, Math.Min(_position, _content.Length))); - builder.Append("|"); - builder.Append(_content.Substring(Math.Min(_position, _content.Length))); - builder.Append("}"); - - return builder.ToString(); - } - } - } - } -} \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentExtensionNode.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentExtensionNode.cs deleted file mode 100644 index 146c116c61..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentExtensionNode.cs +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class ComponentExtensionNode : ExtensionIntermediateNode - { - public IEnumerable Attributes => Children.OfType(); - - public IEnumerable Captures => Children.OfType(); - - public IEnumerable ChildContents => Children.OfType(); - - public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection(); - - public TagHelperDescriptor Component { get; set; } - - /// - /// Gets the child content parameter name (null if unset) that was applied at the component level. - /// - public string ChildContentParameterName { get; set; } - - public IEnumerable TypeArguments => Children.OfType(); - - public string TagName { get; set; } - - // An optional type inference node. This will be populated (and point to a different part of the tree) - // if this component call site requires type inference. - public ComponentTypeInferenceMethodIntermediateNode TypeInferenceNode { get; set; } - - public string TypeName { get; set; } - - public override void Accept(IntermediateNodeVisitor visitor) - { - if (visitor == null) - { - throw new ArgumentNullException(nameof(visitor)); - } - - AcceptExtensionNode(this, visitor); - } - - public override void WriteNode(CodeTarget target, CodeRenderingContext context) - { - if (target == null) - { - throw new ArgumentNullException(nameof(target)); - } - - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - var writer = (BlazorNodeWriter)context.NodeWriter; - writer.WriteComponent(context, this); - } - - private string DebuggerDisplay - { - get - { - var builder = new StringBuilder(); - builder.Append("Component: "); - builder.Append("<"); - builder.Append(TagName); - - foreach (var attribute in Attributes) - { - builder.Append(" "); - builder.Append(attribute.AttributeName); - builder.Append("=\"...\""); - } - - foreach (var capture in Captures) - { - builder.Append(" "); - builder.Append("ref"); - builder.Append("=\"...\""); - } - - foreach (var typeArgument in TypeArguments) - { - builder.Append(" "); - builder.Append(typeArgument.TypeParameterName); - builder.Append("=\"...\""); - } - - builder.Append(">"); - builder.Append(ChildContents.Any() ? "..." : string.Empty); - builder.Append(""); - - return builder.ToString(); - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentLoweringPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentLoweringPass.cs deleted file mode 100644 index eef4b28662..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentLoweringPass.cs +++ /dev/null @@ -1,490 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class ComponentLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass - { - // This pass runs earlier than our other passes that 'lower' specific kinds of attributes. - public override int Order => 0; - - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - var @namespace = documentNode.FindPrimaryNamespace(); - var @class = documentNode.FindPrimaryClass(); - if (@namespace == null || @class == null) - { - // Nothing to do, bail. We can't function without the standard structure. - return; - } - - // For each component *usage* we need to rewrite the tag helper node to map to the relevant component - // APIs. - var references = documentNode.FindDescendantReferences(); - for (var i = 0; i < references.Count; i++) - { - var reference = references[i]; - var node = (TagHelperIntermediateNode)reference.Node; - - var count = 0; - for (var j = 0; j < node.TagHelpers.Count; j++) - { - if (node.TagHelpers[j].IsComponentTagHelper()) - { - // Only allow a single component tag helper per element. If there are multiple, we'll just consider - // the first one and ignore the others. - if (count++ > 1) - { - node.Diagnostics.Add(BlazorDiagnosticFactory.Create_MultipleComponents(node.Source, node.TagName, node.TagHelpers)); - break; - } - } - } - - if (count >= 1) - { - reference.Replace(RewriteAsComponent(node, node.TagHelpers.First(t => t.IsComponentTagHelper()))); - } - else if (node.TagHelpers.Any(t => t.IsChildContentTagHelper())) - { - // Ignore, this will be handled when we rewrite the parent. - } - else - { - reference.Replace(RewriteAsElement(node)); - } - } - } - - private ComponentExtensionNode RewriteAsComponent(TagHelperIntermediateNode node, TagHelperDescriptor tagHelper) - { - var component = new ComponentExtensionNode() - { - Component = tagHelper, - Source = node.Source, - TagName = node.TagName, - TypeName = tagHelper.GetTypeName(), - }; - - for (var i = 0; i < node.Diagnostics.Count; i++) - { - component.Diagnostics.Add(node.Diagnostics[i]); - } - - var visitor = new ComponentRewriteVisitor(component); - visitor.Visit(node); - - // Fixup the parameter names of child content elements. We can't do this during the rewrite - // because we see the nodes in the wrong order. - foreach (var childContent in component.ChildContents) - { - childContent.ParameterName = childContent.ParameterName ?? component.ChildContentParameterName ?? BlazorMetadata.ChildContent.DefaultParameterName; - } - - return component; - } - - private HtmlElementIntermediateNode RewriteAsElement(TagHelperIntermediateNode node) - { - var result = new HtmlElementIntermediateNode() - { - Source = node.Source, - TagName = node.TagName, - }; - - for (var i = 0; i < node.Diagnostics.Count; i++) - { - result.Diagnostics.Add(node.Diagnostics[i]); - } - - var visitor = new ElementRewriteVisitor(result.Children); - visitor.Visit(node); - - return result; - } - - private class ComponentRewriteVisitor : IntermediateNodeWalker - { - private readonly ComponentExtensionNode _component; - private readonly IntermediateNodeCollection _children; - - public ComponentRewriteVisitor(ComponentExtensionNode component) - { - _component = component; - _children = component.Children; - } - - public override void VisitTagHelper(TagHelperIntermediateNode node) - { - // Visit children, we're replacing this node. - base.VisitDefault(node); - } - - public override void VisitTagHelperBody(TagHelperBodyIntermediateNode node) - { - // Wrap the component's children in a ChildContent node if we have some significant - // content. - if (node.Children.Count == 0) - { - return; - } - - // If we get a single HTML content node containing only whitespace, - // then this is probably a tag that looks like ' - // - // We don't want to create a child content for this case, because it can conflict - // with a child content that's set via an attribute. We don't want the formatting - // of insignificant whitespace to be annoying when setting attributes directly. - if (node.Children.Count == 1 && IsIgnorableWhitespace(node.Children[0])) - { - return; - } - - // From here we fork and behave differently based on whether the component's child content is - // implicit or explicit. - // - // Explicit child content will look like:
...
 - // compared with implicit:
- // - // Using implicit child content: - // 1. All content is grouped into a single child content lambda, and assigned to the property 'ChildContent' - // - // Using explicit child content: - // 1. All content must be contained within 'child content' elements that are direct children - // 2. Whitespace outside of 'child content' elements will be ignored (not an error) - // 3. Non-whitespace outside of 'child content' elements will cause an error - // 4. All 'child content' elements must match parameters on the component (exception for ChildContent, - // which is always allowed. - // 5. Each 'child content' element will generate its own lambda, and be assigned to the property - // that matches the element name. - if (!node.Children.OfType().Any(t => t.TagHelpers.Any(th => th.IsChildContentTagHelper()))) - { - // This node has implicit child content. It may or may not have an attribute that matches. - var attribute = _component.Component.BoundAttributes - .Where(a => string.Equals(a.Name, ComponentsApi.RenderTreeBuilder.ChildContent, StringComparison.Ordinal)) - .FirstOrDefault(); - _children.Add(RewriteChildContent(attribute, node.Source, node.Children)); - return; - } - - // OK this node has explicit child content, we can rewrite it by visiting each node - // in sequence, since we: - // a) need to rewrite each child content element - // b) any significant content outside of a child content is an error - for (var i = 0; i < node.Children.Count; i++) - { - var child = node.Children[i]; - if (IsIgnorableWhitespace(child)) - { - continue; - } - - if (child is TagHelperIntermediateNode tagHelperNode && - tagHelperNode.TagHelpers.Any(th => th.IsChildContentTagHelper())) - { - // This is a child content element - var attribute = _component.Component.BoundAttributes - .Where(a => string.Equals(a.Name, tagHelperNode.TagName, StringComparison.Ordinal)) - .FirstOrDefault(); - _children.Add(RewriteChildContent(attribute, child.Source, child.Children)); - continue; - } - - // If we get here then this is significant content inside a component with explicit child content. - child.Diagnostics.Add(BlazorDiagnosticFactory.Create_ChildContentMixedWithExplicitChildContent(child.Source, _component)); - _children.Add(child); - } - - bool IsIgnorableWhitespace(IntermediateNode n) - { - if (n is HtmlContentIntermediateNode html && - html.Children.Count == 1 && - html.Children[0] is IntermediateToken token && - string.IsNullOrWhiteSpace(token.Content)) - { - return true; - } - - return false; - } - } - - private ComponentChildContentIntermediateNode RewriteChildContent(BoundAttributeDescriptor attribute, SourceSpan? source, IntermediateNodeCollection children) - { - var childContent = new ComponentChildContentIntermediateNode() - { - BoundAttribute = attribute, - Source = source, - TypeName = attribute?.TypeName ?? ComponentsApi.RenderFragment.FullTypeName, - }; - - // There are two cases here: - // 1. Implicit child content - the children will be non-taghelper nodes, just accept them - // 2. Explicit child content - the children will be various tag helper nodes, that need special processing. - for (var i = 0; i < children.Count; i++) - { - var child = children[i]; - if (child is TagHelperBodyIntermediateNode body) - { - // The body is all of the content we want to render, the rest of the children will - // be the attributes. - for (var j = 0; j < body.Children.Count; j++) - { - childContent.Children.Add(body.Children[j]); - } - } - else if (child is TagHelperPropertyIntermediateNode property) - { - if (property.BoundAttribute.IsChildContentParameterNameProperty()) - { - // Check for each child content with a parameter name, that the parameter name is specified - // with literal text. For instance, the following is not allowed and should generate a diagnostic. - // - // ... - if (TryGetAttributeStringContent(property, out var parameterName)) - { - childContent.ParameterName = parameterName; - continue; - } - - // The parameter name is invalid. - childContent.Diagnostics.Add(BlazorDiagnosticFactory.Create_ChildContentHasInvalidParameter(property.Source, property.AttributeName, attribute.Name)); - continue; - } - - // This is an unrecognized attribute, this is possible if you try to do something like put 'ref' on a child content. - childContent.Diagnostics.Add(BlazorDiagnosticFactory.Create_ChildContentHasInvalidAttribute(property.Source, property.AttributeName, attribute.Name)); - } - else if (child is TagHelperHtmlAttributeIntermediateNode a) - { - // This is an HTML attribute on a child content. - childContent.Diagnostics.Add(BlazorDiagnosticFactory.Create_ChildContentHasInvalidAttribute(a.Source, a.AttributeName, attribute.Name)); - } - else - { - // This is some other kind of node (likely an implicit child content) - childContent.Children.Add(child); - } - } - - return childContent; - } - - private bool TryGetAttributeStringContent(TagHelperPropertyIntermediateNode property, out string content) - { - // The success path looks like - a single HTML Attribute Value node with tokens - if (property.Children.Count == 1 && - property.Children[0] is HtmlContentIntermediateNode html) - { - content = string.Join(string.Empty, html.Children.OfType().Select(n => n.Content)); - return true; - } - - content = null; - return false; - } - - public override void VisitTagHelperHtmlAttribute(TagHelperHtmlAttributeIntermediateNode node) - { - var attribute = new ComponentAttributeExtensionNode(node); - _children.Add(attribute); - - // Since we don't support complex content, we can rewrite the inside of this - // node to the rather simpler form that property nodes usually have. - for (var i = 0; i < attribute.Children.Count; i++) - { - if (attribute.Children[i] is HtmlAttributeValueIntermediateNode htmlValue) - { - attribute.Children[i] = new HtmlContentIntermediateNode() - { - Children = - { - htmlValue.Children.Single(), - }, - Source = htmlValue.Source, - }; - } - else if (attribute.Children[i] is CSharpExpressionAttributeValueIntermediateNode expressionValue) - { - attribute.Children[i] = new CSharpExpressionIntermediateNode() - { - Children = - { - expressionValue.Children.Single(), - }, - Source = expressionValue.Source, - }; - } - else if (attribute.Children[i] is CSharpCodeAttributeValueIntermediateNode codeValue) - { - attribute.Children[i] = new CSharpExpressionIntermediateNode() - { - Children = - { - codeValue.Children.Single(), - }, - Source = codeValue.Source, - }; - } - } - } - - public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node) - { - // Each 'tag helper property' belongs to a specific tag helper. We want to handle - // the cases for components, but leave others alone. This allows our other passes - // to handle those cases. - if (!node.TagHelper.IsComponentTagHelper()) - { - _children.Add(node); - return; - } - - // Another special case here - this might be a type argument. These don't represent 'real' parameters - // that get passed to the component, it needs special code generation support. - if (node.TagHelper.IsGenericTypedComponent() && node.BoundAttribute.IsTypeParameterProperty()) - { - _children.Add(new ComponentTypeArgumentExtensionNode(node)); - return; - } - - // Another special case here -- this might be a 'Context' parameter, which specifies the name - // for lambda parameter for parameterized child content - if (node.BoundAttribute.IsChildContentParameterNameProperty()) - { - // Check for each child content with a parameter name, that the parameter name is specified - // with literal text. For instance, the following is not allowed and should generate a diagnostic. - // - // ... - if (TryGetAttributeStringContent(node, out var parameterName)) - { - _component.ChildContentParameterName = parameterName; - return; - } - - // The parameter name is invalid. - _component.Diagnostics.Add(BlazorDiagnosticFactory.Create_ChildContentHasInvalidParameterOnComponent(node.Source, node.AttributeName, _component.TagName)); - return; - } - - _children.Add(new ComponentAttributeExtensionNode(node)); - } - - public override void VisitDefault(IntermediateNode node) - { - _children.Add(node); - } - } - - private class ElementRewriteVisitor : IntermediateNodeWalker - { - private readonly IntermediateNodeCollection _children; - - public ElementRewriteVisitor(IntermediateNodeCollection children) - { - _children = children; - } - - public override void VisitTagHelper(TagHelperIntermediateNode node) - { - // Visit children, we're replacing this node. - for (var i = 0; i < node.Children.Count; i++) - { - Visit(node.Children[i]); - } - } - - public override void VisitTagHelperBody(TagHelperBodyIntermediateNode node) - { - for (var i = 0; i < node.Children.Count; i++) - { - _children.Add(node.Children[i]); - } - } - - public override void VisitTagHelperHtmlAttribute(TagHelperHtmlAttributeIntermediateNode node) - { - var attribute = new HtmlAttributeIntermediateNode() - { - AttributeName = node.AttributeName, - Source = node.Source, - }; - _children.Add(attribute); - - for (var i = 0; i < node.Diagnostics.Count; i++) - { - attribute.Diagnostics.Add(node.Diagnostics[i]); - } - - switch (node.AttributeStructure) - { - case AttributeStructure.Minimized: - - attribute.Prefix = node.AttributeName; - attribute.Suffix = string.Empty; - break; - - case AttributeStructure.NoQuotes: - case AttributeStructure.SingleQuotes: - case AttributeStructure.DoubleQuotes: - - // We're ignoring attribute structure here for simplicity, it doesn't effect us. - attribute.Prefix = node.AttributeName + "=\""; - attribute.Suffix = "\""; - - for (var i = 0; i < node.Children.Count; i++) - { - attribute.Children.Add(RewriteAttributeContent(node.Children[i])); - } - - break; - } - - IntermediateNode RewriteAttributeContent(IntermediateNode content) - { - if (content is HtmlContentIntermediateNode html) - { - var value = new HtmlAttributeValueIntermediateNode() - { - Source = content.Source, - }; - - for (var i = 0; i < html.Children.Count; i++) - { - value.Children.Add(html.Children[i]); - } - - for (var i = 0; i < html.Diagnostics.Count; i++) - { - value.Diagnostics.Add(html.Diagnostics[i]); - } - - return value; - } - - - return content; - } - } - - public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node) - { - // Each 'tag helper property' belongs to a specific tag helper. We want to handle - // the cases for components, but leave others alone. This allows our other passes - // to handle those cases. - _children.Add(node.TagHelper.IsComponentTagHelper() ? (IntermediateNode)new ComponentAttributeExtensionNode(node) : node); - } - - public override void VisitDefault(IntermediateNode node) - { - _children.Add(node); - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTagHelperDescriptorProvider.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTagHelperDescriptorProvider.cs deleted file mode 100644 index 9e8972b53f..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTagHelperDescriptorProvider.cs +++ /dev/null @@ -1,505 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Reflection; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.Razor; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class ComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider - { - private static readonly SymbolDisplayFormat FullNameTypeDisplayFormat = - SymbolDisplayFormat.FullyQualifiedFormat - .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted) - .WithMiscellaneousOptions(SymbolDisplayFormat.FullyQualifiedFormat.MiscellaneousOptions & (~SymbolDisplayMiscellaneousOptions.UseSpecialTypes)); - - private static MethodInfo WithMetadataImportOptionsMethodInfo = - typeof(CSharpCompilationOptions) - .GetMethod("WithMetadataImportOptions", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance); - - public bool IncludeDocumentation { get; set; } - - public int Order { get; set; } - - public void Execute(TagHelperDescriptorProviderContext context) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - var compilation = context.GetCompilation(); - if (compilation == null) - { - // No compilation, nothing to do. - return; - } - - // We need to see private members too - compilation = WithMetadataImportOptionsAll(compilation); - - var symbols = BlazorSymbols.Create(compilation); - - var types = new List(); - var visitor = new ComponentTypeVisitor(symbols, types); - - // Visit the primary output of this compilation, as well as all references. - visitor.Visit(compilation.Assembly); - foreach (var reference in compilation.References) - { - // We ignore .netmodules here - there really isn't a case where they are used by user code - // even though the Roslyn APIs all support them. - if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly) - { - visitor.Visit(assembly); - } - } - - for (var i = 0; i < types.Count; i++) - { - var type = types[i]; - var descriptor = CreateDescriptor(symbols, type); - context.Results.Add(descriptor); - - foreach (var childContent in descriptor.GetChildContentProperties()) - { - // Synthesize a separate tag helper for each child content property that's declared. - context.Results.Add(CreateChildContentDescriptor(symbols, descriptor, childContent)); - } - } - } - - private Compilation WithMetadataImportOptionsAll(Compilation compilation) - { - var newCompilationOptions = (CSharpCompilationOptions)WithMetadataImportOptionsMethodInfo - .Invoke(compilation.Options, new object[] { /* All */ (byte)2 }); - return compilation.WithOptions(newCompilationOptions); - } - - private TagHelperDescriptor CreateDescriptor(BlazorSymbols symbols, INamedTypeSymbol type) - { - var typeName = type.ToDisplayString(FullNameTypeDisplayFormat); - var assemblyName = type.ContainingAssembly.Identity.Name; - - var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Component.TagHelperKind, typeName, assemblyName); - builder.SetTypeName(typeName); - - // This opts out this 'component' tag helper for any processing that's specific to the default - // Razor ITagHelper runtime. - builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Component.RuntimeName; - - if (type.IsGenericType) - { - builder.Metadata[BlazorMetadata.Component.GenericTypedKey] = bool.TrueString; - - for (var i = 0; i < type.TypeArguments.Length; i++) - { - var typeParameter = type.TypeArguments[i] as ITypeParameterSymbol; - if (typeParameter != null) - { - CreateTypeParameterProperty(builder, typeParameter); - } - } - } - - var xml = type.GetDocumentationCommentXml(); - if (!string.IsNullOrEmpty(xml)) - { - builder.Documentation = xml; - } - - // Components have very simple matching rules. The type name (short) matches the tag name. - builder.TagMatchingRule(r => r.TagName = type.Name); - - foreach (var property in GetProperties(symbols, type)) - { - if (property.kind == PropertyKind.Ignored) - { - continue; - } - - CreateProperty(builder, property.property, property.kind); - } - - if (builder.BoundAttributes.Any(a => a.IsParameterizedChildContentProperty()) && - !builder.BoundAttributes.Any(a => string.Equals(a.Name, BlazorMetadata.ChildContent.ParameterAttributeName, StringComparison.OrdinalIgnoreCase))) - { - // If we have any parameterized child content parameters, synthesize a 'Context' parameter to be - // able to set the variable name (for all child content). If the developer defined a 'Context' parameter - // already, then theirs wins. - CreateContextParameter(builder, childContentName: null); - } - - var descriptor = builder.Build(); - return descriptor; - } - - private void CreateProperty(TagHelperDescriptorBuilder builder, IPropertySymbol property, PropertyKind kind) - { - builder.BindAttribute(pb => - { - pb.Name = property.Name; - pb.TypeName = property.Type.ToDisplayString(FullNameTypeDisplayFormat); - pb.SetPropertyName(property.Name); - - if (kind == PropertyKind.Enum) - { - pb.IsEnum = true; - } - - if (kind == PropertyKind.ChildContent) - { - pb.Metadata.Add(BlazorMetadata.Component.ChildContentKey, bool.TrueString); - } - - if (kind == PropertyKind.Delegate) - { - pb.Metadata.Add(BlazorMetadata.Component.DelegateSignatureKey, bool.TrueString); - } - - if (HasTypeParameter(property.Type)) - { - pb.Metadata.Add(BlazorMetadata.Component.GenericTypedKey, bool.TrueString); - } - - var xml = property.GetDocumentationCommentXml(); - if (!string.IsNullOrEmpty(xml)) - { - pb.Documentation = xml; - } - }); - - bool HasTypeParameter(ITypeSymbol type) - { - if (type is ITypeParameterSymbol) - { - return true; - } - - // We need to check for cases like: - // [Parameter] List MyProperty { get; set; } - // AND - // [Parameter] List MyProperty { get; set; } - // - // We need to inspect the type arguments to tell the difference between a property that - // uses the containing class' type parameter(s) and a vanilla usage of generic types like - // List<> and Dictionary<,> - // - // Since we need to handle cases like RenderFragment>, this check must be recursive. - if (type is INamedTypeSymbol namedType && namedType.IsGenericType) - { - var typeArguments = namedType.TypeArguments; - for (var i = 0; i < typeArguments.Length; i++) - { - if (HasTypeParameter(typeArguments[i])) - { - return true; - } - } - - // Another case to handle - if the type being inspected is a nested type - // inside a generic containing class. The common usage for this would be a case - // where a generic templated component defines a 'context' nested class. - if (namedType.ContainingType != null && HasTypeParameter(namedType.ContainingType)) - { - return true; - } - } - - return false; - } - } - - private void CreateTypeParameterProperty(TagHelperDescriptorBuilder builder, ITypeSymbol typeParameter) - { - builder.BindAttribute(pb => - { - pb.DisplayName = typeParameter.Name; - pb.Name = typeParameter.Name; - pb.TypeName = typeof(Type).FullName; - pb.SetPropertyName(typeParameter.Name); - - pb.Metadata[BlazorMetadata.Component.TypeParameterKey] = bool.TrueString; - - pb.Documentation = string.Format(Resources.ComponentTypeParameter_Documentation, typeParameter.Name, builder.Name); - }); - } - - private TagHelperDescriptor CreateChildContentDescriptor(BlazorSymbols symbols, TagHelperDescriptor component, BoundAttributeDescriptor attribute) - { - var typeName = component.GetTypeName() + "." + attribute.Name; - var assemblyName = component.AssemblyName; - - var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.ChildContent.TagHelperKind, typeName, assemblyName); - builder.SetTypeName(typeName); - - // This opts out this 'component' tag helper for any processing that's specific to the default - // Razor ITagHelper runtime. - builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.ChildContent.RuntimeName; - - // Opt out of processing as a component. We'll process this specially as part of the component's body. - builder.Metadata[BlazorMetadata.SpecialKindKey] = BlazorMetadata.ChildContent.TagHelperKind; - - var xml = attribute.Documentation; - if (!string.IsNullOrEmpty(xml)) - { - builder.Documentation = xml; - } - - // Child content matches the property name, but only as a direct child of the component. - builder.TagMatchingRule(r => - { - r.TagName = attribute.Name; - r.ParentTag = component.TagMatchingRules.First().TagName; - }); - - if (attribute.IsParameterizedChildContentProperty()) - { - // For child content attributes with a parameter, synthesize an attribute that allows you to name - // the parameter. - CreateContextParameter(builder, attribute.Name); - } - - var descriptor = builder.Build(); - - return descriptor; - } - - private void CreateContextParameter(TagHelperDescriptorBuilder builder, string childContentName) - { - builder.BindAttribute(b => - { - b.Name = BlazorMetadata.ChildContent.ParameterAttributeName; - b.TypeName = typeof(string).FullName; - b.Metadata.Add(BlazorMetadata.Component.ChildContentParameterNameKey, bool.TrueString); - - if (childContentName == null) - { - b.Documentation = Resources.ChildContentParameterName_TopLevelDocumentation; - } - else - { - b.Documentation = string.Format(Resources.ChildContentParameterName_Documentation, childContentName); - } - }); - } - - // Does a walk up the inheritance chain to determine the set of parameters by using - // a dictionary keyed on property name. - // - // We consider parameters to be defined by properties satisfying all of the following: - // - are visible (not shadowed) - // - have the [Parameter] attribute - // - have a setter, even if private - // - are not indexers - private IEnumerable<(IPropertySymbol property, PropertyKind kind)> GetProperties(BlazorSymbols symbols, INamedTypeSymbol type) - { - var properties = new Dictionary(StringComparer.Ordinal); - do - { - if (type == symbols.ComponentBase) - { - // The ComponentBase base class doesn't have any [Parameter]. - // Bail out now to avoid walking through its many members, plus the members - // of the System.Object base class. - break; - } - - var members = type.GetMembers(); - for (var i = 0; i < members.Length; i++) - { - var property = members[i] as IPropertySymbol; - if (property == null) - { - // Not a property - continue; - } - - if (properties.ContainsKey(property.Name)) - { - // Not visible - continue; - } - - var kind = PropertyKind.Default; - if (property.Parameters.Length != 0) - { - // Indexer - kind = PropertyKind.Ignored; - } - - if (property.SetMethod == null) - { - // No setter - kind = PropertyKind.Ignored; - } - - if (property.IsStatic) - { - kind = PropertyKind.Ignored; - } - - if (!property.GetAttributes().Any(a => a.AttributeClass == symbols.ParameterAttribute)) - { - // Does not have [Parameter] - kind = PropertyKind.Ignored; - } - - if (kind == PropertyKind.Default && property.Type.TypeKind == TypeKind.Enum) - { - kind = PropertyKind.Enum; - } - - if (kind == PropertyKind.Default && property.Type == symbols.RenderFragment) - { - kind = PropertyKind.ChildContent; - } - - if (kind == PropertyKind.Default && - property.Type is INamedTypeSymbol namedType && - namedType.IsGenericType && - namedType.ConstructedFrom == symbols.RenderFragmentOfT) - { - kind = PropertyKind.ChildContent; - } - - if (kind == PropertyKind.Default && property.Type.TypeKind == TypeKind.Delegate) - { - kind = PropertyKind.Delegate; - } - - properties.Add(property.Name, (property, kind)); - } - - type = type.BaseType; - } - while (type != null); - - return properties.Values; - } - - private enum PropertyKind - { - Ignored, - Default, - Enum, - ChildContent, - Delegate, - } - - private class BlazorSymbols - { - public static BlazorSymbols Create(Compilation compilation) - { - var symbols = new BlazorSymbols(); - symbols.ComponentBase = compilation.GetTypeByMetadataName(ComponentsApi.ComponentBase.MetadataName); - if (symbols.ComponentBase == null) - { - // No definition for ComponentBase, nothing to do. - return null; - } - - symbols.IComponent = compilation.GetTypeByMetadataName(ComponentsApi.IComponent.MetadataName); - if (symbols.IComponent == null) - { - // No definition for IComponent, nothing to do. - return null; - } - - symbols.ParameterAttribute = compilation.GetTypeByMetadataName(ComponentsApi.ParameterAttribute.MetadataName); - if (symbols.ParameterAttribute == null) - { - // No definition for [Parameter], nothing to do. - return null; - } - - symbols.RenderFragment = compilation.GetTypeByMetadataName(ComponentsApi.RenderFragment.MetadataName); - if (symbols.RenderFragment == null) - { - // No definition for RenderFragment, nothing to do. - } - - symbols.RenderFragmentOfT = compilation.GetTypeByMetadataName(ComponentsApi.RenderFragmentOfT.MetadataName); - if (symbols.RenderFragmentOfT == null) - { - // No definition for RenderFragment, nothing to do. - } - - return symbols; - } - - private BlazorSymbols() - { - } - - public INamedTypeSymbol ComponentBase { get; private set; } - - public INamedTypeSymbol IComponent { get; private set; } - - public INamedTypeSymbol ParameterAttribute { get; private set; } - - public INamedTypeSymbol RenderFragment { get; private set; } - - public INamedTypeSymbol RenderFragmentOfT { get; private set; } - } - - private class ComponentTypeVisitor : SymbolVisitor - { - private readonly BlazorSymbols _symbols; - private readonly List _results; - - public ComponentTypeVisitor(BlazorSymbols symbols, List results) - { - _symbols = symbols; - _results = results; - } - - public override void VisitNamedType(INamedTypeSymbol symbol) - { - if (IsComponent(symbol)) - { - _results.Add(symbol); - } - } - - public override void VisitNamespace(INamespaceSymbol symbol) - { - foreach (var member in symbol.GetMembers()) - { - Visit(member); - } - } - - public override void VisitAssembly(IAssemblySymbol symbol) - { - // This as a simple yet high-value optimization that excludes the vast majority of - // assemblies that (by definition) can't contain a component. - if (symbol.Name != null && !symbol.Name.StartsWith("System.", StringComparison.Ordinal)) - { - Visit(symbol.GlobalNamespace); - } - } - - internal bool IsComponent(INamedTypeSymbol symbol) - { - if (_symbols == null) - { - return false; - } - - return - symbol.DeclaredAccessibility == Accessibility.Public && - !symbol.IsAbstract && - symbol.AllInterfaces.Contains(_symbols.IComponent); - } - } - } -} \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeArgumentExtensionNode.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeArgumentExtensionNode.cs deleted file mode 100644 index 20bbc11493..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeArgumentExtensionNode.cs +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class ComponentTypeArgumentExtensionNode : ExtensionIntermediateNode - { - public ComponentTypeArgumentExtensionNode(TagHelperPropertyIntermediateNode propertyNode) - { - if (propertyNode == null) - { - throw new ArgumentNullException(nameof(propertyNode)); - } - - BoundAttribute = propertyNode.BoundAttribute; - Source = propertyNode.Source; - TagHelper = propertyNode.TagHelper; - - for (var i = 0; i < propertyNode.Children.Count; i++) - { - Children.Add(propertyNode.Children[i]); - } - - for (var i = 0; i < propertyNode.Diagnostics.Count; i++) - { - Diagnostics.Add(propertyNode.Diagnostics[i]); - } - } - - public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection(); - - public BoundAttributeDescriptor BoundAttribute { get; set; } - - public string TypeParameterName => BoundAttribute.Name; - - public TagHelperDescriptor TagHelper { get; set; } - - public override void Accept(IntermediateNodeVisitor visitor) - { - if (visitor == null) - { - throw new ArgumentNullException(nameof(visitor)); - } - - AcceptExtensionNode(this, visitor); - } - - public override void WriteNode(CodeTarget target, CodeRenderingContext context) - { - if (target == null) - { - throw new ArgumentNullException(nameof(target)); - } - - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - var writer = (BlazorNodeWriter)context.NodeWriter; - writer.WriteComponentTypeArgument(context, this); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeInferenceMethodIntermediateNode.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeInferenceMethodIntermediateNode.cs deleted file mode 100644 index 8716473db6..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeInferenceMethodIntermediateNode.cs +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - /// - /// Represents a type-inference thunk that is used by the generated component code. - /// - internal class ComponentTypeInferenceMethodIntermediateNode : ExtensionIntermediateNode - { - public Dictionary Bindings { get; set; } - - public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly; - - /// - /// Gets the component usage linked to this type inference method. - /// - public ComponentExtensionNode Component { get; set; } - - /// - /// Gets the full type name of the generated class containing this method. - /// - public string FullTypeName { get; internal set; } - - /// - /// Gets the name of the generated method. - /// - public string MethodName { get; set; } - - public override void Accept(IntermediateNodeVisitor visitor) - { - if (visitor == null) - { - throw new ArgumentNullException(nameof(visitor)); - } - - AcceptExtensionNode(this, visitor); - } - - public override void WriteNode(CodeTarget target, CodeRenderingContext context) - { - if (target == null) - { - throw new ArgumentNullException(nameof(target)); - } - - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - var writer = (BlazorNodeWriter)context.NodeWriter; - writer.WriteComponentTypeInferenceMethod(context, this); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/DocumentIntermediateNodeExtensions.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/DocumentIntermediateNodeExtensions.cs deleted file mode 100644 index 12e5afb2aa..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/DocumentIntermediateNodeExtensions.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; - -namespace Microsoft.AspNetCore.Razor.Language.Intermediate -{ - internal static class DocumentIntermediateNodeExtensions - { - public static IReadOnlyList FindDescendantReferences(this DocumentIntermediateNode document) - where TNode : IntermediateNode - { - if (document == null) - { - throw new ArgumentNullException(nameof(document)); - } - - var visitor = new ReferenceVisitor(); - visitor.Visit(document); - return visitor.References; - } - - private class ReferenceVisitor : IntermediateNodeWalker - where TNode : IntermediateNode - { - public List References = new List(); - - public override void VisitDefault(IntermediateNode node) - { - base.VisitDefault(node); - - // Use a post-order traversal because references are used to replace nodes, and thus - // change the parent nodes. - // - // This ensures that we always operate on the leaf nodes first. - if (node is TNode) - { - References.Add(new IntermediateNodeReference(Parent, node)); - } - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EliminateMethodBodyPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EliminateMethodBodyPass.cs deleted file mode 100644 index ee50775307..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EliminateMethodBodyPass.cs +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class EliminateMethodBodyPass : IntermediateNodePassBase, IRazorOptimizationPass - { - // Run early in the optimization phase - public override int Order => Int32.MinValue; - - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - if (codeDocument == null) - { - throw new ArgumentNullException(nameof(codeDocument)); - } - - if (documentNode == null) - { - throw new ArgumentNullException(nameof(documentNode)); - } - - var method = documentNode.FindPrimaryMethod(); - if (method == null) - { - return; - } - - method.Children.Clear(); - - // After we clear all of the method body there might be some unused fields, which can be - // blocking if compiling with warnings as errors. Suppress this warning so that it doesn't - // get annoying in VS. - documentNode.Children.Insert(documentNode.Children.IndexOf(documentNode.FindPrimaryNamespace()), new CSharpCodeIntermediateNode() - { - Children = - { - // Field is assigned but never used - new IntermediateToken() - { - Content = "#pragma warning disable 0414" + Environment.NewLine, - Kind = TokenKind.CSharp, - }, - - // Field is never assigned - new IntermediateToken() - { - Content = "#pragma warning disable 0649" + Environment.NewLine, - Kind = TokenKind.CSharp, - }, - - // Field is never used - new IntermediateToken() - { - Content = "#pragma warning disable 0169" + Environment.NewLine, - Kind = TokenKind.CSharp, - }, - }, - }); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerLoweringPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerLoweringPass.cs deleted file mode 100644 index 1997d7f3f0..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerLoweringPass.cs +++ /dev/null @@ -1,211 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Linq; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Extensions; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class EventHandlerLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass - { - public override int Order => 50; - - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - var @namespace = documentNode.FindPrimaryNamespace(); - var @class = documentNode.FindPrimaryClass(); - if (@namespace == null || @class == null) - { - // Nothing to do, bail. We can't function without the standard structure. - return; - } - - // For each event handler *usage* we need to rewrite the tag helper node to map to basic constructs. - // Each usage will be represented by a tag helper property that is a descendant of either - // a component or element. - var references = documentNode.FindDescendantReferences(); - - var parents = new HashSet(); - for (var i = 0; i < references.Count; i++) - { - parents.Add(references[i].Parent); - } - - foreach (var parent in parents) - { - ProcessDuplicates(parent); - } - - for (var i = 0; i < references.Count; i++) - { - var reference = references[i]; - var node = (TagHelperPropertyIntermediateNode)reference.Node; - - if (!reference.Parent.Children.Contains(node)) - { - // This node was removed as a duplicate, skip it. - continue; - } - - if (node.TagHelper.IsEventHandlerTagHelper()) - { - reference.Replace(RewriteUsage(reference.Parent, node)); - } - } - } - - private void ProcessDuplicates(IntermediateNode parent) - { - // Reverse order because we will remove nodes. - // - // Each 'property' node could be duplicated if there are multiple tag helpers that match that - // particular attribute. This is likely to happen when a component also defines something like - // OnClick. We want to remove the 'onclick' and let it fall back to be handled by the component. - for (var i = parent.Children.Count - 1; i >= 0; i--) - { - var eventHandler = parent.Children[i] as TagHelperPropertyIntermediateNode; - if (eventHandler != null && - eventHandler.TagHelper != null && - eventHandler.TagHelper.IsEventHandlerTagHelper()) - { - for (var j = 0; j < parent.Children.Count; j++) - { - var componentAttribute = parent.Children[j] as ComponentAttributeExtensionNode; - if (componentAttribute != null && - componentAttribute.TagHelper != null && - componentAttribute.TagHelper.IsComponentTagHelper() && - componentAttribute.AttributeName == eventHandler.AttributeName) - { - // Found a duplicate - remove the 'fallback' in favor of the component's own handling. - parent.Children.RemoveAt(i); - break; - } - } - } - } - - // If we still have duplicates at this point then they are genuine conflicts. - var duplicates = parent.Children - .OfType() - .Where(p => p.TagHelper?.IsEventHandlerTagHelper() ?? false) - .GroupBy(p => p.AttributeName) - .Where(g => g.Count() > 1); - - foreach (var duplicate in duplicates) - { - parent.Diagnostics.Add(BlazorDiagnosticFactory.CreateEventHandler_Duplicates( - parent.Source, - duplicate.Key, - duplicate.ToArray())); - foreach (var property in duplicate) - { - parent.Children.Remove(property); - } - } - } - - private IntermediateNode RewriteUsage(IntermediateNode parent, TagHelperPropertyIntermediateNode node) - { - var original = GetAttributeContent(node); - if (original.Count == 0) - { - // This can happen in error cases, the parser will already have flagged this - // as an error, so ignore it. - return node; - } - - // Now rewrite the content of the value node to look like: - // - // BindMethods.GetEventHandlerValue() - // - // This method is overloaded on string and TDelegate, which means that it will put the code in the - // correct context for intellisense when typing in the attribute. - var eventArgsType = node.TagHelper.GetEventArgsType(); - var tokens = new List() - { - new IntermediateToken() - { - Content = $"{ComponentsApi.BindMethods.GetEventHandlerValue}<{eventArgsType}>(", - Kind = TokenKind.CSharp - }, - new IntermediateToken() - { - Content = $")", - Kind = TokenKind.CSharp - } - }; - - for (var i = 0; i < original.Count; i++) - { - tokens.Insert(i + 1, original[i]); - } - - if (parent is HtmlElementIntermediateNode) - { - var result = new HtmlAttributeIntermediateNode() - { - AttributeName = node.AttributeName, - Source = node.Source, - - Prefix = node.AttributeName + "=\"", - Suffix = "\"", - }; - - for (var i = 0; i < node.Diagnostics.Count; i++) - { - result.Diagnostics.Add(node.Diagnostics[i]); - } - - result.Children.Add(new CSharpExpressionAttributeValueIntermediateNode()); - for (var i = 0; i < tokens.Count; i++) - { - result.Children[0].Children.Add(tokens[i]); - } - - return result; - } - else - { - var result = new ComponentAttributeExtensionNode(node); - - result.Children.Clear(); - result.Children.Add(new CSharpExpressionIntermediateNode()); - for (var i = 0; i < tokens.Count; i++) - { - result.Children[0].Children.Add(tokens[i]); - } - - return result; - } - } - - private static IReadOnlyList GetAttributeContent(TagHelperPropertyIntermediateNode node) - { - var template = node.FindDescendantNodes().FirstOrDefault(); - if (template != null) - { - // See comments in TemplateDiagnosticPass - node.Diagnostics.Add(BlazorDiagnosticFactory.Create_TemplateInvalidLocation(template.Source)); - return new[] { new IntermediateToken() { Kind = TokenKind.CSharp, Content = string.Empty, }, }; - } - - if (node.Children.Count == 1 && node.Children[0] is HtmlContentIntermediateNode htmlContentNode) - { - // This case can be hit for a 'string' attribute. We want to turn it into - // an expression. - var tokens = htmlContentNode.FindDescendantNodes(); - - var content = "\"" + string.Join(string.Empty, tokens.Select(t => t.Content.Replace("\"", "\\\""))) + "\""; - return new[] { new IntermediateToken() { Content = content, Kind = TokenKind.CSharp, } }; - } - else - { - return node.FindDescendantNodes(); - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerTagHelperDescriptorProvider.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerTagHelperDescriptorProvider.cs deleted file mode 100644 index 5daa724cef..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerTagHelperDescriptorProvider.cs +++ /dev/null @@ -1,220 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Razor; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class EventHandlerTagHelperDescriptorProvider : ITagHelperDescriptorProvider - { - public int Order { get; set; } - - public RazorEngine Engine { get; set; } - - public void Execute(TagHelperDescriptorProviderContext context) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - var compilation = context.GetCompilation(); - if (compilation == null) - { - return; - } - - var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.BindMethods.FullTypeName); - if (bindMethods == null) - { - // If we can't find BindMethods, then just bail. We won't be able to compile the - // generated code anyway. - return; - } - - - var eventHandlerData = GetEventHandlerData(compilation); - - foreach (var tagHelper in CreateEventHandlerTagHelpers(eventHandlerData)) - { - context.Results.Add(tagHelper); - } - } - - private List GetEventHandlerData(Compilation compilation) - { - var eventHandlerAttribute = compilation.GetTypeByMetadataName(ComponentsApi.EventHandlerAttribute.FullTypeName); - if (eventHandlerAttribute == null) - { - // This won't likely happen, but just in case. - return new List(); - } - - var types = new List(); - var visitor = new EventHandlerDataVisitor(types); - - // Visit the primary output of this compilation, as well as all references. - visitor.Visit(compilation.Assembly); - foreach (var reference in compilation.References) - { - // We ignore .netmodules here - there really isn't a case where they are used by user code - // even though the Roslyn APIs all support them. - if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly) - { - visitor.Visit(assembly); - } - } - - var results = new List(); - - for (var i = 0; i < types.Count; i++) - { - var type = types[i]; - var attributes = type.GetAttributes(); - - // Not handling duplicates here for now since we're the primary ones extending this. - // If we see users adding to the set of event handler constructs we will want to add deduplication - // and potentially diagnostics. - for (var j = 0; j < attributes.Length; j++) - { - var attribute = attributes[j]; - - if (attribute.AttributeClass == eventHandlerAttribute) - { - results.Add(new EventHandlerData( - type.ContainingAssembly.Name, - type.ToDisplayString(), - (string)attribute.ConstructorArguments[0].Value, - (INamedTypeSymbol)attribute.ConstructorArguments[1].Value)); - } - } - } - - return results; - } - - private List CreateEventHandlerTagHelpers(List data) - { - var results = new List(); - - for (var i = 0; i < data.Count; i++) - { - var entry = data[i]; - - var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.EventHandler.TagHelperKind, entry.Attribute, entry.Assembly); - builder.Documentation = string.Format( - Resources.EventHandlerTagHelper_Documentation, - entry.Attribute, - entry.EventArgsType.ToDisplayString()); - - builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.EventHandler.TagHelperKind); - builder.Metadata.Add(BlazorMetadata.EventHandler.EventArgsType, entry.EventArgsType.ToDisplayString()); - builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.EventHandler.RuntimeName; - - // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the tooltips. - builder.SetTypeName(entry.TypeName); - - builder.TagMatchingRule(rule => - { - rule.TagName = "*"; - - rule.Attribute(a => - { - a.Name = entry.Attribute; - a.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.FullMatch; - }); - }); - - builder.BindAttribute(a => - { - a.Documentation = string.Format( - Resources.EventHandlerTagHelper_Documentation, - entry.Attribute, - entry.EventArgsType.ToDisplayString()); - - a.Name = entry.Attribute; - - // Use a string here so that we get HTML context by default. - a.TypeName = typeof(string).FullName; - - // But make this weakly typed (don't type check) - delegates have their own type-checking - // logic that we don't want to interfere with. - a.Metadata.Add(BlazorMetadata.Component.WeaklyTypedKey, bool.TrueString); - - // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the tooltips. - a.SetPropertyName(entry.Attribute); - }); - - results.Add(builder.Build()); - } - - return results; - } - - private struct EventHandlerData - { - public EventHandlerData( - string assembly, - string typeName, - string element, - INamedTypeSymbol eventArgsType) - { - Assembly = assembly; - TypeName = typeName; - Attribute = element; - EventArgsType = eventArgsType; - } - - public string Assembly { get; } - - public string TypeName { get; } - - public string Attribute { get; } - - public INamedTypeSymbol EventArgsType { get; } - } - - private class EventHandlerDataVisitor : SymbolVisitor - { - private List _results; - - public EventHandlerDataVisitor(List results) - { - _results = results; - } - - public override void VisitNamedType(INamedTypeSymbol symbol) - { - if (symbol.Name == "EventHandlers" && symbol.DeclaredAccessibility == Accessibility.Public) - { - _results.Add(symbol); - } - } - - public override void VisitNamespace(INamespaceSymbol symbol) - { - foreach (var member in symbol.GetMembers()) - { - Visit(member); - } - } - - public override void VisitAssembly(IAssemblySymbol symbol) - { - // This as a simple yet high-value optimization that excludes the vast majority of - // assemblies that (by definition) can't contain a component. - if (symbol.Name != null && !symbol.Name.StartsWith("System.", StringComparison.Ordinal)) - { - Visit(symbol.GlobalNamespace); - } - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericComponentPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericComponentPass.cs deleted file mode 100644 index bd9974a381..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericComponentPass.cs +++ /dev/null @@ -1,305 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Linq; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Syntax; - -namespace Microsoft.AspNetCore.Components.Razor -{ - // This pass: - // 1. Adds diagnostics for missing generic type arguments - // 2. Rewrites the type name of the component to substitute generic type arguments - // 3. Rewrites the type names of parameters/child content to substitute generic type arguments - internal class GenericComponentPass : IntermediateNodePassBase, IRazorOptimizationPass - { - // Runs after components/eventhandlers/ref/bind/templates. We want to validate every component - // and it's usage of ChildContent. - public override int Order => 160; - - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - var visitor = new Visitor(); - visitor.Visit(documentNode); - } - - - private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor - { - // Incrementing ID for type inference method names - private int _id; - - public void VisitExtension(ComponentExtensionNode node) - { - if (node.Component.IsGenericTypedComponent()) - { - // Not generic, ignore. - Process(node); - } - - base.VisitDefault(node); - } - - private void Process(ComponentExtensionNode node) - { - // First collect all of the information we have about each type parameter - // - // Listing all type parameters that exist - var bindings = new Dictionary(); - foreach (var attribute in node.Component.GetTypeParameters()) - { - bindings.Add(attribute.Name, new GenericTypeNameRewriter.Binding() { Attribute = attribute, }); - } - - // Listing all type arguments that have been specified. - var hasTypeArgumentSpecified = false; - foreach (var typeArgumentNode in node.TypeArguments) - { - hasTypeArgumentSpecified = true; - - var binding = bindings[typeArgumentNode.TypeParameterName]; - binding.Node = typeArgumentNode; - binding.Content = GetContent(typeArgumentNode); - } - - if (hasTypeArgumentSpecified) - { - // OK this means that the developer has specified at least one type parameter. - // Either they specified everything and its OK to rewrite, or its an error. - if (ValidateTypeArguments(node, bindings)) - { - RewriteTypeNames(new GenericTypeNameRewriter(bindings), node); - } - - return; - } - - // OK if we get here that means that no type arguments were specified, so we will try to infer - // the type. - // - // The actual inference is done by the C# compiler, we just emit an a method that represents the - // use of this component. - - // Since we're generating code in a different namespace, we need to 'global qualify' all of the types - // to avoid clashes with our generated code. - RewriteTypeNames(new GlobalQualifiedTypeNameRewriter(bindings.Keys), node); - - // - // We need to verify that an argument was provided that 'covers' each type parameter. - // - // For example, consider a repeater where the generic type is the 'item' type, but the developer has - // not set the items. We won't be able to do type inference on this and so it will just be nonsense. - var attributes = node.Attributes.Select(a => a.BoundAttribute).Concat(node.ChildContents.Select(c => c.BoundAttribute)); - foreach (var attribute in attributes) - { - if (attribute == null) - { - // Will be null for attributes set on the component that don't match a declared component parameter - continue; - } - - // Now we need to parse the type name and extract the generic parameters. - // - // Two cases; - // 1. name is a simple identifier like TItem - // 2. name contains type parameters like Dictionary - if (!attribute.IsGenericTypedProperty()) - { - continue; - } - - var parsed = SyntaxFactory.ParseTypeName(attribute.TypeName); - if (parsed is IdentifierNameSyntax identifier) - { - bindings.Remove(identifier.ToString()); - } - else - { - var typeParameters = parsed.DescendantNodesAndSelf().OfType().SelectMany(arg => arg.Arguments); - foreach (var typeParameter in typeParameters) - { - bindings.Remove(typeParameter.ToString()); - } - } - } - - // If any bindings remain then this means we would never be able to infer the arguments of this - // component usage because the user hasn't set properties that include all of the types. - if (bindings.Count > 0) - { - // However we still want to generate 'type inference' code because we want the errors to be as - // helpful as possible. So let's substitute 'object' for all of those type parameters, and add - // an error. - RewriteTypeNames(new GenericTypeNameRewriter(bindings), node); - - node.Diagnostics.Add(BlazorDiagnosticFactory.Create_GenericComponentTypeInferenceUnderspecified(node.Source, node, node.Component.GetTypeParameters())); - } - - // Next we need to generate a type inference 'method' node. This represents a method that we will codegen that - // contains all of the operations on the render tree building. Calling a method to operate on the builder - // will allow the C# compiler to perform type inference. - var documentNode = (DocumentIntermediateNode)Ancestors[Ancestors.Count - 1]; - CreateTypeInferenceMethod(documentNode, node, bindings); - } - - private string GetContent(ComponentTypeArgumentExtensionNode node) - { - return string.Join(string.Empty, node.FindDescendantNodes().Where(t => t.IsCSharp).Select(t => t.Content)); - } - - private static bool ValidateTypeArguments(ComponentExtensionNode node, Dictionary bindings) - { - var missing = new List(); - foreach (var binding in bindings) - { - if (binding.Value.Node == null || string.IsNullOrWhiteSpace(binding.Value.Content)) - { - missing.Add(binding.Value.Attribute); - } - } - - if (missing.Count > 0) - { - // We add our own error for this because its likely the user will see other errors due - // to incorrect codegen without the types. Our errors message will pretty clearly indicate - // what to do, whereas the other errors might be confusing. - node.Diagnostics.Add(BlazorDiagnosticFactory.Create_GenericComponentMissingTypeArgument(node.Source, node, missing)); - return false; - } - - return true; - } - - private void RewriteTypeNames(CSharpSyntaxRewriter rewriter, ComponentExtensionNode node) - { - // Rewrite the component type name - node.TypeName = RewriteTypeName(rewriter, node.TypeName); - - foreach (var attribute in node.Attributes) - { - if (attribute.BoundAttribute?.IsGenericTypedProperty() ?? false && attribute.TypeName != null) - { - // If we know the type name, then replace any generic type parameter inside it with - // the known types. - attribute.TypeName = RewriteTypeName(rewriter, attribute.TypeName); - } - else if (attribute.TypeName == null && (attribute.BoundAttribute?.IsDelegateProperty() ?? false)) - { - // This is a weakly typed delegate, treat it as Action - attribute.TypeName = "System.Action"; - } - else if (attribute.TypeName == null) - { - // This is a weakly typed attribute, treat it as System.Object - attribute.TypeName = "System.Object"; - } - } - - foreach (var capture in node.Captures) - { - if (capture.IsComponentCapture && capture.ComponentCaptureTypeName != null) - { - capture.ComponentCaptureTypeName = RewriteTypeName(rewriter, capture.ComponentCaptureTypeName); - } - else if (capture.IsComponentCapture) - { - capture.ComponentCaptureTypeName = "System.Object"; - } - } - - foreach (var childContent in node.ChildContents) - { - if (childContent.BoundAttribute?.IsGenericTypedProperty() ?? false && childContent.TypeName != null) - { - // If we know the type name, then replace any generic type parameter inside it with - // the known types. - childContent.TypeName = RewriteTypeName(rewriter, childContent.TypeName); - } - else if (childContent.IsParameterized) - { - // This is a weakly typed parameterized child content, treat it as RenderFragment - childContent.TypeName = ComponentsApi.RenderFragment.FullTypeName + ""; - } - else - { - // This is a weakly typed child content, treat it as RenderFragment - childContent.TypeName = ComponentsApi.RenderFragment.FullTypeName; - } - } - } - - private string RewriteTypeName(CSharpSyntaxRewriter rewriter, string typeName) - { - var parsed = SyntaxFactory.ParseTypeName(typeName); - var rewritten = (TypeSyntax)rewriter.Visit(parsed); - return rewritten.ToFullString(); - } - - private void CreateTypeInferenceMethod( - DocumentIntermediateNode documentNode, - ComponentExtensionNode node, - Dictionary bindings) - { - var @namespace = documentNode.FindPrimaryNamespace().Content; - @namespace = string.IsNullOrEmpty(@namespace) ? "__Blazor" : "__Blazor." + @namespace; - @namespace += "." + documentNode.FindPrimaryClass().ClassName; - - var typeInferenceNode = new ComponentTypeInferenceMethodIntermediateNode() - { - Bindings = bindings, - Component = node, - - // Method name is generated and guaranteed not to collide, since it's unique for each - // component call site. - MethodName = $"Create{node.TagName}_{_id++}", - FullTypeName = @namespace + ".TypeInference", - }; - - node.TypeInferenceNode = typeInferenceNode; - - // Now we need to insert the type inference node into the tree. - var namespaceNode = documentNode.Children - .OfType() - .Where(n => n.Annotations.Contains(new KeyValuePair(BlazorMetadata.Component.GenericTypedKey, bool.TrueString))) - .FirstOrDefault(); - if (namespaceNode == null) - { - namespaceNode = new NamespaceDeclarationIntermediateNode() - { - Annotations = - { - { BlazorMetadata.Component.GenericTypedKey, bool.TrueString }, - }, - Content = @namespace, - }; - - documentNode.Children.Add(namespaceNode); - } - - var classNode = namespaceNode.Children - .OfType() - .Where(n => n.ClassName == "TypeInference") - .FirstOrDefault(); - if (classNode == null) - { - classNode = new ClassDeclarationIntermediateNode() - { - ClassName = "TypeInference", - Modifiers = - { - "internal", - "static", - }, - }; - namespaceNode.Children.Add(classNode); - } - - classNode.Children.Add(typeInferenceNode); - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericTypeNameRewriter.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericTypeNameRewriter.cs deleted file mode 100644 index 33ccacd6ec..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericTypeNameRewriter.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Syntax; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class GenericTypeNameRewriter : CSharpSyntaxRewriter - { - private readonly Dictionary _bindings; - - public GenericTypeNameRewriter(Dictionary bindings) - { - _bindings = bindings; - } - - public override SyntaxNode Visit(SyntaxNode node) - { - // We can handle a single IdentifierNameSyntax at the top level (like 'TItem) - // OR a GenericNameSyntax recursively (like `List`) - if (node is IdentifierNameSyntax identifier && !(identifier.Parent is QualifiedNameSyntax)) - { - if (_bindings.TryGetValue(identifier.Identifier.Text, out var binding)) - { - // If we don't have a valid replacement, use object. This will make the code at least reasonable - // compared to leaving the type parameter in place. - // - // We add our own diagnostics for missing/invalid type parameters anyway. - var replacement = binding?.Content == null ? typeof(object).FullName : binding.Content; - return identifier.Update(SyntaxFactory.Identifier(replacement)); - } - } - - return base.Visit(node); - } - - public override SyntaxNode VisitGenericName(GenericNameSyntax node) - { - var args = node.TypeArgumentList.Arguments; - for (var i = 0; i < args.Count; i++) - { - var typeArgument = args[i]; - args = args.Replace(typeArgument, (TypeSyntax)Visit(typeArgument)); - } - - return node.WithTypeArgumentList(node.TypeArgumentList.WithArguments(args)); - } - - public class Binding - { - public BoundAttributeDescriptor Attribute { get; set; } - - public string Content { get; set; } - - public ComponentTypeArgumentExtensionNode Node { get; set; } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GlobalQualifiedTypeNameRewriter.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GlobalQualifiedTypeNameRewriter.cs deleted file mode 100644 index f1f62516fa..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/GlobalQualifiedTypeNameRewriter.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Syntax; - -namespace Microsoft.AspNetCore.Components.Razor -{ - // Rewrites type names to use the 'global::' prefix for identifiers. - // - // This is useful when we're generating code in a different namespace than - // what the user code lives in. When we synthesize a namespace it's easy to have - // clashes. - internal class GlobalQualifiedTypeNameRewriter : CSharpSyntaxRewriter - { - // List of names to ignore. - // - // NOTE: this is the list of type parameters defined on the component. - private readonly HashSet _ignore; - - public GlobalQualifiedTypeNameRewriter(IEnumerable ignore) - { - _ignore = new HashSet(ignore); - } - - public override SyntaxNode Visit(SyntaxNode node) - { - return base.Visit(node); - } - - public override SyntaxNode VisitQualifiedName(QualifiedNameSyntax node) - { - if (node.Parent is QualifiedNameSyntax) - { - return base.VisitQualifiedName(node); - } - - // Need to rewrite postorder so we can rewrite the names of generic type arguments. - node = (QualifiedNameSyntax)base.VisitQualifiedName(node); - - // Rewriting these is complicated, best to just tostring and parse again. - return SyntaxFactory.ParseTypeName("global::" + node.ToString()); - } - - public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node) - { - if (_ignore.Contains(node.ToString())) - { - return node; - } - - if (node.Parent != null) - { - return node; - } - - return SyntaxFactory.AliasQualifiedName(SyntaxFactory.IdentifierName(SyntaxFactory.Token(SyntaxKind.GlobalKeyword)), node); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockIntermediateNode.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockIntermediateNode.cs deleted file mode 100644 index 55574ad329..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockIntermediateNode.cs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Diagnostics; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - [DebuggerDisplay("{DebuggerDisplay,nq}")] - internal class HtmlBlockIntermediateNode : ExtensionIntermediateNode - { - public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection(); - - public string Content { get; set; } - - public override void Accept(IntermediateNodeVisitor visitor) - { - if (visitor == null) - { - throw new ArgumentNullException(nameof(visitor)); - } - - AcceptExtensionNode(this, visitor); - } - - public override void WriteNode(CodeTarget target, CodeRenderingContext context) - { - if (target == null) - { - throw new ArgumentNullException(nameof(target)); - } - - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - var writer = (BlazorNodeWriter)context.NodeWriter; - writer.WriteHtmlBlock(context, this); - } - - private string DebuggerDisplay => Content; - } -} \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockPass.cs deleted file mode 100644 index f4098ac1e1..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockPass.cs +++ /dev/null @@ -1,349 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using AngleSharp.Html; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - // Rewrites contiguous subtrees of HTML into a special node type to reduce the - // size of the Render tree. - // - // Does not preserve insignificant details of the HTML, like tag closing style - // or quote style. - internal class HtmlBlockPass : IntermediateNodePassBase, IRazorOptimizationPass - { - // Runs LATE because we want to destroy structure. - public override int Order => 10000; - - protected override void ExecuteCore( - RazorCodeDocument codeDocument, - DocumentIntermediateNode documentNode) - { - if (documentNode.Options.DesignTime) - { - // Nothing to do during design time. - return; - } - - var findVisitor = new FindHtmlTreeVisitor(); - findVisitor.Visit(documentNode); - - var trees = findVisitor.Trees; - var rewriteVisitor = new RewriteVisitor(trees); - while (trees.Count > 0) - { - // Walk backwards since we did a postorder traversal. - var reference = trees[trees.Count - 1]; - - // Forcibly remove a node to prevent infinite loops. - trees.RemoveAt(trees.Count - 1); - - // We want to fold together siblings where possible. To do this, first we find - // the index of the node we're looking at now - then we need to walk backwards - // and identify a set of contiguous nodes we can merge. - var start = reference.Parent.Children.Count - 1; - for (; start >= 0; start--) - { - if (ReferenceEquals(reference.Node, reference.Parent.Children[start])) - { - break; - } - } - - // This is the current node. Check if the left sibling is always a candidate - // for rewriting. Due to the order we processed the nodes, we know that the - // left sibling is next in the list to process if it's a candidate. - var end = start; - while (start - 1 >= 0) - { - var candidate = reference.Parent.Children[start - 1]; - if (trees.Count == 0 || !ReferenceEquals(trees[trees.Count - 1].Node, candidate)) - { - // This means the we're out of nodes, or the left sibling is not in the list. - break; - } - - // This means that the left sibling is valid to merge. - start--; - - // Remove this since we're combining it. - trees.RemoveAt(trees.Count - 1); - } - - // As a degenerate case, don't bother rewriting an single HtmlContent node - // It doesn't add any value. - if (end - start == 0 && reference.Node is HtmlContentIntermediateNode) - { - continue; - } - - // Now we know the range of nodes to rewrite (end is inclusive) - var length = end + 1 - start; - while (length > 0) - { - // Keep using start since we're removing nodes. - var node = reference.Parent.Children[start]; - reference.Parent.Children.RemoveAt(start); - - rewriteVisitor.Visit(node); - - length--; - } - - reference.Parent.Children.Insert(start, new HtmlBlockIntermediateNode() - { - Content = rewriteVisitor.Builder.ToString(), - }); - - rewriteVisitor.Builder.Clear(); - } - } - - // Finds HTML-blocks using a postorder traversal. We store nodes in an - // ordered list so we can avoid redundant rewrites. - // - // Consider a case like: - //
- // click me - //
- // - // We would store both the div and a tag in a list, but make sure to visit - // the div first. Then when we process the div (recursively), we would remove - // the a from the list. - private class FindHtmlTreeVisitor : - IntermediateNodeWalker, - IExtensionIntermediateNodeVisitor - { - private bool _foundNonHtml; - - public List Trees { get; } = new List(); - - public override void VisitDefault(IntermediateNode node) - { - // If we get here, we found a non-HTML node. Keep traversing. - _foundNonHtml = true; - base.VisitDefault(node); - } - - public void VisitExtension(HtmlElementIntermediateNode node) - { - // We need to restore the state after processing this node. - // We might have found a leaf-block of HTML, but that shouldn't - // affect our parent's state. - var originalState = _foundNonHtml; - - _foundNonHtml = false; - - if (node.HasDiagnostics) - { - // Treat node with errors as non-HTML - don't let the parent rewrite this either. - _foundNonHtml = true; - } - - if (string.Equals("script", node.TagName, StringComparison.OrdinalIgnoreCase)) - { - // Treat script tags as non-HTML - we trigger errors for script tags - // later. - _foundNonHtml = true; - } - - base.VisitDefault(node); - - if (!_foundNonHtml) - { - Trees.Add(new IntermediateNodeReference(Parent, node)); - } - - _foundNonHtml = originalState |= _foundNonHtml; - } - - public override void VisitHtmlAttribute(HtmlAttributeIntermediateNode node) - { - if (node.HasDiagnostics) - { - // Treat node with errors as non-HTML - _foundNonHtml = true; - } - - // Visit Children - base.VisitDefault(node); - } - - public override void VisitHtmlAttributeValue(HtmlAttributeValueIntermediateNode node) - { - if (node.HasDiagnostics) - { - // Treat node with errors as non-HTML - _foundNonHtml = true; - } - - // Visit Children - base.VisitDefault(node); - } - - public override void VisitHtml(HtmlContentIntermediateNode node) - { - // We need to restore the state after processing this node. - // We might have found a leaf-block of HTML, but that shouldn't - // affect our parent's state. - var originalState = _foundNonHtml; - - _foundNonHtml = false; - - if (node.HasDiagnostics) - { - // Treat node with errors as non-HTML - _foundNonHtml = true; - } - - // Visit Children - base.VisitDefault(node); - - if (!_foundNonHtml) - { - Trees.Add(new IntermediateNodeReference(Parent, node)); - } - - _foundNonHtml = originalState |= _foundNonHtml; - } - - public override void VisitToken(IntermediateToken node) - { - if (node.HasDiagnostics) - { - // Treat node with errors as non-HTML - _foundNonHtml = true; - } - - if (node.IsCSharp) - { - _foundNonHtml = true; - } - } - } - - private class RewriteVisitor : - IntermediateNodeWalker, - IExtensionIntermediateNodeVisitor - { - private readonly StringBuilder _encodingBuilder; - - private readonly List _trees; - - public RewriteVisitor(List trees) - { - _trees = trees; - - _encodingBuilder = new StringBuilder(); - } - - public StringBuilder Builder { get; } = new StringBuilder(); - - public void VisitExtension(HtmlElementIntermediateNode node) - { - for (var i = 0; i < _trees.Count; i++) - { - // Remove this node if it's in the list. This ensures that we don't - // do redundant operations. - if (ReferenceEquals(_trees[i].Node, node)) - { - _trees.RemoveAt(i); - break; - } - } - - var isVoid = ComponentDocumentRewritePass.VoidElements.Contains(node.TagName); - var hasBodyContent = node.Body.Any(); - - Builder.Append("<"); - Builder.Append(node.TagName); - - foreach (var attribute in node.Attributes) - { - Visit(attribute); - } - - // If for some reason a void element contains body, then treat it as a - // start/end tag. - if (!hasBodyContent && isVoid) - { - // void - Builder.Append(">"); - return; - } - else if (!hasBodyContent) - { - // In HTML5, we can't have self-closing non-void elements, so explicitly - // add a close tag - Builder.Append(">"); - return; - } - - // start/end tag with body. - Builder.Append(">"); - - foreach (var item in node.Body) - { - Visit(item); - } - - Builder.Append(""); - } - - public override void VisitHtmlAttribute(HtmlAttributeIntermediateNode node) - { - Builder.Append(" "); - Builder.Append(node.AttributeName); - - if (node.Children.Count == 0) - { - // Minimized attribute - return; - } - - Builder.Append("=\""); - - // Visit Children - base.VisitDefault(node); - - Builder.Append("\""); - } - - public override void VisitHtmlAttributeValue(HtmlAttributeValueIntermediateNode node) - { - Builder.Append(Encode(node.Children)); - } - - public override void VisitHtml(HtmlContentIntermediateNode node) - { - Builder.Append(Encode(node.Children)); - } - - private string Encode(IntermediateNodeCollection nodes) - { - // We need to HTML encode text content. We would have decoded HTML entities - // earlier when we parsed the text into a tree, but since we're folding - // this node into a block of pre-encoded HTML we need to be sure to - // re-encode. - _encodingBuilder.Clear(); - - for (var i = 0; i < nodes.Count; i++) - { - _encodingBuilder.Append(((IntermediateToken)nodes[i]).Content); - } - - return HtmlMarkupFormatter.Instance.Text(_encodingBuilder.ToString()); - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlElementIntermediateNode.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlElementIntermediateNode.cs deleted file mode 100644 index 4ba3ffbd36..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlElementIntermediateNode.cs +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - [DebuggerDisplay("{DebuggerDisplay,nq}")] - internal class HtmlElementIntermediateNode : ExtensionIntermediateNode - { - public IEnumerable Attributes => Children.OfType(); - - public IEnumerable Captures => Children.OfType(); - - public IEnumerable Body => Children.Where(c => - { - return - c as HtmlAttributeIntermediateNode == null && - c as RefExtensionNode == null; - }); - - public override IntermediateNodeCollection Children { get; } = new IntermediateNodeCollection(); - - public string TagName { get; set; } - - public override void Accept(IntermediateNodeVisitor visitor) - { - if (visitor == null) - { - throw new ArgumentNullException(nameof(visitor)); - } - - AcceptExtensionNode(this, visitor); - } - - public override void WriteNode(CodeTarget target, CodeRenderingContext context) - { - if (target == null) - { - throw new ArgumentNullException(nameof(target)); - } - - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - var writer = (BlazorNodeWriter)context.NodeWriter; - writer.WriteHtmlElement(context, this); - } - - private string DebuggerDisplay - { - get - { - var builder = new StringBuilder(); - builder.Append("Element: "); - builder.Append("<"); - builder.Append(TagName); - - foreach (var attribute in Attributes) - { - builder.Append(" "); - builder.Append(attribute.AttributeName); - builder.Append("=\"...\""); - } - - foreach (var capture in Captures) - { - builder.Append(" "); - builder.Append("ref"); - builder.Append("=\"...\""); - } - - builder.Append(">"); - builder.Append(Body.Any() ? "..." : string.Empty); - builder.Append(""); - - return builder.ToString(); - } - } - } -} \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirective.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirective.cs deleted file mode 100644 index 6ebceb3e09..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirective.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Razor.Language; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal static class ImplementsDirective - { - public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective( - "implements", - DirectiveKind.SingleLine, - builder => - { - builder.AddTypeToken(Resources.ImplementsDirective_TypeToken_Name, Resources.ImplementsDirective_TypeToken_Description); - builder.Usage = DirectiveUsage.FileScopedMultipleOccurring; - builder.Description = Resources.ImplementsDirective_Description; - }); - - public static void Register(RazorProjectEngineBuilder builder) - { - if (builder == null) - { - throw new ArgumentNullException(nameof(builder)); - } - - builder.AddDirective(Directive); - builder.Features.Add(new ImplementsDirectivePass()); - } - } -} \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirectivePass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirectivePass.cs deleted file mode 100644 index 8acdd08dfc..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirectivePass.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.Linq; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Extensions; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class ImplementsDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass - { - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - var @class = documentNode.FindPrimaryClass(); - if (@class == null) - { - return; - } - - if (@class.Interfaces == null) - { - @class.Interfaces = new List(); - } - - foreach (var implements in documentNode.FindDirectiveReferences(ImplementsDirective.Directive)) - { - var token = ((DirectiveIntermediateNode)implements.Node).Tokens.FirstOrDefault(); - if (token != null) - { - @class.Interfaces.Add(token.Content); - } - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/InjectDirective.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/InjectDirective.cs deleted file mode 100644 index 659d747210..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/InjectDirective.cs +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Microsoft.AspNetCore.Components.Razor -{ - // Much of the following is equivalent to Microsoft.AspNetCore.Mvc.Razor.Extensions's InjectDirective, - // but this one outputs properties annotated for Blazor's property injector, plus it doesn't need to - // support multiple CodeTargets. - - internal class InjectDirective - { - public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective( - "inject", - DirectiveKind.SingleLine, - builder => - { - builder.AddTypeToken("TypeName", "The type of the service to inject."); - builder.AddMemberToken("PropertyName", "The name of the property."); - builder.Usage = DirectiveUsage.FileScopedMultipleOccurring; - builder.Description = "Inject a service from the application's service container into a property."; - }); - - public static void Register(RazorProjectEngineBuilder builder) - { - builder.AddDirective(Directive); - builder.Features.Add(new Pass()); - } - - private class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass - { - protected override void ExecuteCore( - RazorCodeDocument codeDocument, - DocumentIntermediateNode documentNode) - { - var visitor = new Visitor(); - visitor.Visit(documentNode); - - var properties = new HashSet(StringComparer.Ordinal); - var classNode = documentNode.FindPrimaryClass(); - - for (var i = visitor.Directives.Count - 1; i >= 0; i--) - { - var directive = visitor.Directives[i]; - var tokens = directive.Tokens.ToArray(); - if (tokens.Length < 2) - { - continue; - } - - var typeName = tokens[0].Content; - var memberName = tokens[1].Content; - - if (!properties.Add(memberName)) - { - continue; - } - - classNode.Children.Add(new InjectIntermediateNode(typeName, memberName)); - } - } - - private class Visitor : IntermediateNodeWalker - { - public IList Directives { get; } - = new List(); - - public override void VisitDirective(DirectiveIntermediateNode node) - { - if (node.Directive == Directive) - { - Directives.Add(node); - } - } - } - - internal class InjectIntermediateNode : ExtensionIntermediateNode - { - private static readonly IList _injectedPropertyModifiers = new[] - { - $"[global::{ComponentsApi.InjectAttribute.FullTypeName}]", - "private" // Encapsulation is the default - }; - - public string TypeName { get; } - public string MemberName { get; } - public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly; - - public InjectIntermediateNode(string typeName, string memberName) - { - TypeName = typeName; - MemberName = memberName; - } - - public override void Accept(IntermediateNodeVisitor visitor) - => AcceptExtensionNode(this, visitor); - - public override void WriteNode(CodeTarget target, CodeRenderingContext context) - => context.CodeWriter.WriteAutoPropertyDeclaration( - _injectedPropertyModifiers, - TypeName, - MemberName); - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirective.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirective.cs deleted file mode 100644 index b54694f6a8..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirective.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Razor.Language; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal static class LayoutDirective - { - public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective( - "layout", - DirectiveKind.SingleLine, - builder => - { - builder.AddTypeToken(Resources.LayoutDirective_TypeToken_Name, Resources.LayoutDirective_TypeToken_Description); - builder.Usage = DirectiveUsage.FileScopedSinglyOccurring; - builder.Description = Resources.LayoutDirective_Description; - }); - - public static void Register(RazorProjectEngineBuilder builder) - { - if (builder == null) - { - throw new ArgumentNullException(nameof(builder)); - } - - builder.AddDirective(Directive); - builder.Features.Add(new LayoutDirectivePass()); - } - } -} \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirectivePass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirectivePass.cs deleted file mode 100644 index c86c66dcc8..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirectivePass.cs +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class LayoutDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass - { - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - var @namespace = documentNode.FindPrimaryNamespace(); - var @class = documentNode.FindPrimaryClass(); - if (@namespace == null || @class == null) - { - return; - } - - var directives = documentNode.FindDirectiveReferences(LayoutDirective.Directive); - if (directives.Count == 0) - { - return; - } - - var token = ((DirectiveIntermediateNode)directives[0].Node).Tokens.FirstOrDefault(); - if (token == null) - { - return; - } - - var attributeNode = new CSharpCodeIntermediateNode(); - attributeNode.Children.Add(new IntermediateToken() - { - Kind = TokenKind.CSharp, - Content = $"[{ComponentsApi.LayoutAttribute.FullTypeName}(typeof({token.Content}))]" + Environment.NewLine, - }); - - // Insert the new attribute on top of the class - for (var i = 0; i < @namespace.Children.Count; i++) - { - if (object.ReferenceEquals(@namespace.Children[i], @class)) - { - @namespace.Children.Insert(i, attributeNode); - break; - } - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Microsoft.AspNetCore.Components.Razor.Extensions.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Microsoft.AspNetCore.Components.Razor.Extensions.csproj deleted file mode 100644 index 215a562aaa..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Microsoft.AspNetCore.Components.Razor.Extensions.csproj +++ /dev/null @@ -1,38 +0,0 @@ - - - - netstandard2.0 - $(TargetFrameworks);net461 - Microsoft.AspNetCore.Components.Razor - Extensions to the Razor compiler to support building Razor Components. - true - - - true - - - - - - - - - - - True - True - Resources.resx - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - - diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirective.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirective.cs deleted file mode 100644 index 107ddc61bd..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirective.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class PageDirective - { - public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective( - "page", - DirectiveKind.SingleLine, - builder => - { - builder.AddStringToken(Resources.PageDirective_RouteToken_Name, Resources.PageDirective_RouteToken_Description); - builder.Usage = DirectiveUsage.FileScopedMultipleOccurring; - builder.Description = Resources.PageDirective_Description; - }); - - private PageDirective(string routeTemplate, IntermediateNode directiveNode) - { - RouteTemplate = routeTemplate; - DirectiveNode = directiveNode; - } - - public string RouteTemplate { get; } - - public IntermediateNode DirectiveNode { get; } - - public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder) - { - if (builder == null) - { - throw new ArgumentNullException(nameof(builder)); - } - - builder.AddDirective(Directive); - builder.Features.Add(new PageDirectivePass()); - return builder; - } - } -} \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirectivePass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirectivePass.cs deleted file mode 100644 index 02d9dfadeb..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirectivePass.cs +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class PageDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass - { - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - if (codeDocument == null) - { - throw new ArgumentNullException(nameof(codeDocument)); - } - - if (documentNode == null) - { - throw new ArgumentNullException(nameof(documentNode)); - } - - var @namespace = documentNode.FindPrimaryNamespace(); - var @class = documentNode.FindPrimaryClass(); - if (@namespace == null || @class == null) - { - return; - } - - var directives = documentNode.FindDirectiveReferences(PageDirective.Directive); - if (directives.Count == 0) - { - return; - } - - // We don't allow @page directives in imports - for (var i = 0; i < directives.Count; i++) - { - var directive = directives[i]; - if (directive.Node.IsImported()) - { - directive.Node.Diagnostics.Add(BlazorDiagnosticFactory.CreatePageDirective_CannotBeImported(directive.Node.Source.Value)); - } - } - - // Insert the attributes 'on-top' of the class declaration, since classes don't directly support attributes. - var index = 0; - for (; index < @namespace.Children.Count; index++) - { - if (object.ReferenceEquals(@class, @namespace.Children[index])) - { - break; - } - } - - for (var i = 0; i < directives.Count; i++) - { - var pageDirective = (DirectiveIntermediateNode)directives[i].Node; - - // The parser also adds errors for invalid syntax, we just need to not crash. - var routeToken = pageDirective.Tokens.FirstOrDefault(); - - if (routeToken != null && - routeToken.Content.Length >= 3 && - routeToken.Content[0] == '\"' && - routeToken.Content[1] == '/' && - routeToken.Content[routeToken.Content.Length - 1] == '\"') - { - var template = routeToken.Content.Substring(1, routeToken.Content.Length - 2); - @namespace.Children.Insert(index++, new RouteAttributeExtensionNode(template)); - } - else - { - pageDirective.Diagnostics.Add(BlazorDiagnosticFactory.CreatePageDirective_MustSpecifyRoute(pageDirective.Source)); - } - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Properties/AssemblyInfo.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Properties/AssemblyInfo.cs deleted file mode 100644 index aeed5583ac..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Runtime.CompilerServices; -using Microsoft.AspNetCore.Components.Razor; -using Microsoft.AspNetCore.Razor.Language; - -// These should match the configuration names specified by the Blazor MSBuild files. -[assembly: ProvideRazorExtensionInitializer("Blazor-0.1", typeof(BlazorExtensionInitializer))] -[assembly: ProvideRazorExtensionInitializer("BlazorDeclaration-0.1", typeof(BlazorExtensionInitializer))] - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RazorCompilerException.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RazorCompilerException.cs deleted file mode 100644 index dbf64be1a7..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RazorCompilerException.cs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Razor.Language; -using System; - -namespace Microsoft.AspNetCore.Components.Razor -{ - /// - /// Represents a fatal error during the transformation of a Blazor component from - /// Razor source code to C# source code. - /// - public class RazorCompilerException : Exception - { - /// - /// Constructs an instance of . - /// - /// - public RazorCompilerException(RazorDiagnostic diagnostic) - { - Diagnostic = diagnostic; - } - - /// - /// Gets the diagnostic value. - /// - public RazorDiagnostic Diagnostic { get; } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefExtensionNode.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefExtensionNode.cs deleted file mode 100644 index dd7c131e2f..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefExtensionNode.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; -using System; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class RefExtensionNode : ExtensionIntermediateNode - { - public RefExtensionNode(IntermediateToken identifierToken) - { - IdentifierToken = identifierToken ?? throw new ArgumentNullException(nameof(identifierToken)); - Source = IdentifierToken.Source; - } - - public RefExtensionNode(IntermediateToken identifierToken, string componentCaptureTypeName) - : this(identifierToken) - { - if (string.IsNullOrEmpty(componentCaptureTypeName)) - { - throw new ArgumentException("Cannot be null or empty", nameof(componentCaptureTypeName)); - } - - IsComponentCapture = true; - ComponentCaptureTypeName = componentCaptureTypeName; - } - - public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly; - - public IntermediateToken IdentifierToken { get; } - - public bool IsComponentCapture { get; } - - public string ComponentCaptureTypeName { get; set; } - - public string TypeName => $"global::System.Action<{(IsComponentCapture ? ComponentCaptureTypeName : "global::" + ComponentsApi.ElementRef.FullTypeName)}>"; - - public override void Accept(IntermediateNodeVisitor visitor) - { - if (visitor == null) - { - throw new ArgumentNullException(nameof(visitor)); - } - - AcceptExtensionNode(this, visitor); - } - - public override void WriteNode(CodeTarget target, CodeRenderingContext context) - { - if (target == null) - { - throw new ArgumentNullException(nameof(target)); - } - - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - var writer = (BlazorNodeWriter)context.NodeWriter; - writer.WriteReferenceCapture(context, this); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefLoweringPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefLoweringPass.cs deleted file mode 100644 index 01ee14e059..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefLoweringPass.cs +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class RefLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass - { - // Run after component lowering pass - public override int Order => 50; - - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - var @namespace = documentNode.FindPrimaryNamespace(); - var @class = documentNode.FindPrimaryClass(); - if (@namespace == null || @class == null) - { - // Nothing to do, bail. We can't function without the standard structure. - return; - } - - var references = documentNode.FindDescendantReferences(); - for (var i = 0; i < references.Count; i++) - { - var reference = references[i]; - var node = (TagHelperPropertyIntermediateNode)reference.Node; - - if (node.TagHelper.IsRefTagHelper()) - { - reference.Replace(RewriteUsage(@class, reference.Parent, node)); - } - } - } - - private IntermediateNode RewriteUsage(ClassDeclarationIntermediateNode classNode, IntermediateNode parent, TagHelperPropertyIntermediateNode node) - { - // If we can't get a nonempty attribute name, do nothing because there will - // already be a diagnostic for empty values - var identifierToken = DetermineIdentifierToken(node); - if (identifierToken == null) - { - return node; - } - - // Determine whether this is an element capture or a component capture, and - // if applicable the type name that will appear in the resulting capture code - var componentTagHelper = (parent as ComponentExtensionNode)?.Component; - if (componentTagHelper != null) - { - return new RefExtensionNode(identifierToken, componentTagHelper.GetTypeName()); - } - else - { - return new RefExtensionNode(identifierToken); - } - } - - private IntermediateToken DetermineIdentifierToken(TagHelperPropertyIntermediateNode attributeNode) - { - IntermediateToken foundToken = null; - - if (attributeNode.Children.Count == 1) - { - if (attributeNode.Children[0] is IntermediateToken token) - { - foundToken = token; - } - else if (attributeNode.Children[0] is CSharpExpressionIntermediateNode csharpNode) - { - if (csharpNode.Children.Count == 1) - { - foundToken = csharpNode.Children[0] as IntermediateToken; - } - } - } - - return !string.IsNullOrWhiteSpace(foundToken?.Content) ? foundToken : null; - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefTagHelperDescriptorProvider.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefTagHelperDescriptorProvider.cs deleted file mode 100644 index ecb9dda000..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefTagHelperDescriptorProvider.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language; -using System; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class RefTagHelperDescriptorProvider : ITagHelperDescriptorProvider - { - // Run after the component tag helper provider, because later we may want component-type-specific variants of this - public int Order { get; set; } = 1000; - - public RazorEngine Engine { get; set; } - - public void Execute(TagHelperDescriptorProviderContext context) - { - if (context == null) - { - throw new ArgumentNullException(nameof(context)); - } - - context.Results.Add(CreateRefTagHelper()); - } - - private TagHelperDescriptor CreateRefTagHelper() - { - var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Ref.TagHelperKind, "Ref", ComponentsApi.AssemblyName); - builder.Documentation = Resources.RefTagHelper_Documentation; - - builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Ref.TagHelperKind); - builder.Metadata[TagHelperMetadata.Runtime.Name] = BlazorMetadata.Ref.RuntimeName; - - // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the tooltips. - builder.SetTypeName("Microsoft.AspNetCore.Components.Ref"); - - builder.TagMatchingRule(rule => - { - rule.TagName = "*"; - rule.Attribute(attribute => - { - attribute.Name = "ref"; - }); - }); - - builder.BindAttribute(attribute => - { - attribute.Documentation = Resources.RefTagHelper_Documentation; - attribute.Name = "ref"; - - // WTE has a bug 15.7p1 where a Tag Helper without a display-name that looks like - // a C# property will crash trying to create the tooltips. - attribute.SetPropertyName("Ref"); - attribute.TypeName = typeof(object).FullName; - }); - - return builder.Build(); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.Designer.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.Designer.cs deleted file mode 100644 index a1254633d8..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.Designer.cs +++ /dev/null @@ -1,270 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Microsoft.AspNetCore.Components.Razor { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNetCore.Components.Razor.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to Binds the provided expression to the '{0}' property and a change event delegate to the '{1}' property of the component.. - /// - internal static string BindTagHelper_Component_Documentation { - get { - return ResourceManager.GetString("BindTagHelper_Component_Documentation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Binds the provided expression to the '{0}' attribute and a change event delegate to the '{1}' attribute.. - /// - internal static string BindTagHelper_Element_Documentation { - get { - return ResourceManager.GetString("BindTagHelper_Element_Documentation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Specifies a format to convert the value specified by the '{0}' attribute. The format string can currently only be used with expressions of type <code>DateTime</code>.. - /// - internal static string BindTagHelper_Element_Format_Documentation { - get { - return ResourceManager.GetString("BindTagHelper_Element_Format_Documentation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Binds the provided expression to an attribute and a change event, based on the naming of the bind attribute. For example: <code>bind-value-onchange="..."</code> will assign the current value of the expression to the 'value' attribute, and assign a delegate that attempts to set the value to the 'onchange' attribute.. - /// - internal static string BindTagHelper_Fallback_Documentation { - get { - return ResourceManager.GetString("BindTagHelper_Fallback_Documentation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Specifies a format to convert the value specified by the corresponding bind attribute. For example: <code>format-value="..."</code> will apply a format string to the value specified in <code>bind-value-...</code>. The format string can currently only be used with expressions of type <code>DateTime</code>.. - /// - internal static string BindTagHelper_Fallback_Format_Documentation { - get { - return ResourceManager.GetString("BindTagHelper_Fallback_Format_Documentation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Specifies the parameter name for the '{0}' child content expression.. - /// - internal static string ChildContentParameterName_Documentation { - get { - return ResourceManager.GetString("ChildContentParameterName_Documentation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Specifies the parameter name for all child content expressions.. - /// - internal static string ChildContentParameterName_TopLevelDocumentation { - get { - return ResourceManager.GetString("ChildContentParameterName_TopLevelDocumentation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Specifies the type of the type parameter {0} for the {1} component.. - /// - internal static string ComponentTypeParameter_Documentation { - get { - return ResourceManager.GetString("ComponentTypeParameter_Documentation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Sets the '{0}' attribute to the provided string or delegate value. A delegate value should be of type '{1}'.. - /// - internal static string EventHandlerTagHelper_Documentation { - get { - return ResourceManager.GetString("EventHandlerTagHelper_Documentation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Declares an interface implementation for the current document.. - /// - internal static string ImplementsDirective_Description { - get { - return ResourceManager.GetString("ImplementsDirective_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The interface type implemented by the current document.. - /// - internal static string ImplementsDirective_TypeToken_Description { - get { - return ResourceManager.GetString("ImplementsDirective_TypeToken_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to TypeName. - /// - internal static string ImplementsDirective_TypeToken_Name { - get { - return ResourceManager.GetString("ImplementsDirective_TypeToken_Name", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Declares a layout type for the current document.. - /// - internal static string LayoutDirective_Description { - get { - return ResourceManager.GetString("LayoutDirective_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The interface type implemented by the current document.. - /// - internal static string LayoutDirective_TypeToken_Description { - get { - return ResourceManager.GetString("LayoutDirective_TypeToken_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to TypeName. - /// - internal static string LayoutDirective_TypeToken_Name { - get { - return ResourceManager.GetString("LayoutDirective_TypeToken_Name", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Mark the page as a routable component.. - /// - internal static string PageDirective_Description { - get { - return ResourceManager.GetString("PageDirective_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to An optional route template for the component.. - /// - internal static string PageDirective_RouteToken_Description { - get { - return ResourceManager.GetString("PageDirective_RouteToken_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to route template. - /// - internal static string PageDirective_RouteToken_Name { - get { - return ResourceManager.GetString("PageDirective_RouteToken_Name", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file. - /// - internal static string PageDirectiveCannotBeImported { - get { - return ResourceManager.GetString("PageDirectiveCannotBeImported", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Populates the specified field or property with a reference to the element or component.. - /// - internal static string RefTagHelper_Documentation { - get { - return ResourceManager.GetString("RefTagHelper_Documentation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Declares a generic type parameter for the generated component class.. - /// - internal static string TypeParamDirective_Description { - get { - return ResourceManager.GetString("TypeParamDirective_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The name of the type parameter.. - /// - internal static string TypeParamDirective_Token_Description { - get { - return ResourceManager.GetString("TypeParamDirective_Token_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to type parameter. - /// - internal static string TypeParamDirective_Token_Name { - get { - return ResourceManager.GetString("TypeParamDirective_Token_Name", resourceCulture); - } - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.resx b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.resx deleted file mode 100644 index 3fe9868ecd..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.resx +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Binds the provided expression to the '{0}' property and a change event delegate to the '{1}' property of the component. - - - Binds the provided expression to the '{0}' attribute and a change event delegate to the '{1}' attribute. - - - Specifies a format to convert the value specified by the '{0}' attribute. The format string can currently only be used with expressions of type <code>DateTime</code>. - - - Binds the provided expression to an attribute and a change event, based on the naming of the bind attribute. For example: <code>bind-value-onchange="..."</code> will assign the current value of the expression to the 'value' attribute, and assign a delegate that attempts to set the value to the 'onchange' attribute. - - - Specifies a format to convert the value specified by the corresponding bind attribute. For example: <code>format-value="..."</code> will apply a format string to the value specified in <code>bind-value-...</code>. The format string can currently only be used with expressions of type <code>DateTime</code>. - - - Specifies the parameter name for the '{0}' child content expression. - - - Specifies the parameter name for all child content expressions. - - - Specifies the type of the type parameter {0} for the {1} component. - - - Sets the '{0}' attribute to the provided string or delegate value. A delegate value should be of type '{1}'. - - - Declares an interface implementation for the current document. - - - The interface type implemented by the current document. - - - TypeName - - - Declares a layout type for the current document. - - - The interface type implemented by the current document. - - - TypeName - - - The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file - - - Mark the page as a routable component. - - - An optional route template for the component. - - - route template - - - Populates the specified field or property with a reference to the element or component. - - - Declares a generic type parameter for the generated component class. - - - The name of the type parameter. - - - type parameter - - \ No newline at end of file diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RouteAttributeExtensionNode.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RouteAttributeExtensionNode.cs deleted file mode 100644 index 6c37269b30..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/RouteAttributeExtensionNode.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Components.Shared; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class RouteAttributeExtensionNode : ExtensionIntermediateNode - { - public RouteAttributeExtensionNode(string template) - { - Template = template; - } - - public string Template { get; } - - public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly; - - public override void Accept(IntermediateNodeVisitor visitor) => AcceptExtensionNode(this, visitor); - - public override void WriteNode(CodeTarget target, CodeRenderingContext context) - { - context.CodeWriter.Write("["); - context.CodeWriter.Write(ComponentsApi.RouteAttribute.FullTypeName); - context.CodeWriter.Write("(\""); - context.CodeWriter.Write(Template); - context.CodeWriter.Write("\")"); - context.CodeWriter.Write("]"); - context.CodeWriter.WriteLine(); - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScopeStack.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScopeStack.cs deleted file mode 100644 index 065af81c15..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScopeStack.cs +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using Microsoft.AspNetCore.Razor.Language.CodeGeneration; - -namespace Microsoft.AspNetCore.Components.Razor -{ - /// - /// Keeps track of the nesting of elements/containers while writing out the C# source code - /// for a component. This allows us to detect mismatched start/end tags, as well as inject - /// additional C# source to capture component descendants in a lambda. - /// - internal class ScopeStack - { - private readonly Stack _stack = new Stack(); - private int _builderVarNumber = 1; - - public string BuilderVarName { get; private set; } = "builder"; - - public void OpenComponentScope(CodeRenderingContext context, string name, string parameterName) - { - var scope = new ScopeEntry(name, ScopeKind.Component); - _stack.Push(scope); - - OffsetBuilderVarNumber(1); - - // Writes code that looks like: - // - // ((__builder) => { ... }) - // OR - // ((context) => (__builder) => { ... }) - - if (parameterName != null) - { - context.CodeWriter.Write($"({parameterName}) => "); - } - - scope.LambdaScope = context.CodeWriter.BuildLambda(BuilderVarName); - } - - public void OpenTemplateScope(CodeRenderingContext context) - { - var currentScope = new ScopeEntry("__template", ScopeKind.Template); - _stack.Push(currentScope); - - // Templates always get a lambda scope, because they are defined as a lambda. - OffsetBuilderVarNumber(1); - currentScope.LambdaScope = context.CodeWriter.BuildLambda(BuilderVarName); - } - - public void CloseScope(CodeRenderingContext context) - { - var currentScope = _stack.Pop(); - currentScope.LambdaScope.Dispose(); - OffsetBuilderVarNumber(-1); - } - - private void OffsetBuilderVarNumber(int delta) - { - _builderVarNumber += delta; - BuilderVarName = _builderVarNumber == 1 - ? "builder" - : $"builder{_builderVarNumber}"; - } - - private class ScopeEntry - { - public readonly string Name; - public ScopeKind Kind; - public int ChildCount; - public IDisposable LambdaScope; - - public ScopeEntry(string name, ScopeKind kind) - { - Name = name; - Kind = kind; - ChildCount = 0; - } - - public override string ToString() => $"<{Name}> ({Kind})"; - } - - private enum ScopeKind - { - Component, - Template, - } - } -} diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScriptTagPass.cs b/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScriptTagPass.cs deleted file mode 100644 index c983ce83ec..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScriptTagPass.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using AngleSharp; -using AngleSharp.Html; -using AngleSharp.Parser.Html; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal class ScriptTagPass : IntermediateNodePassBase, IRazorDocumentClassifierPass - { - // Run as soon as possible after the Component rewrite pass - public override int Order => ComponentDocumentClassifierPass.DefaultFeatureOrder + 2; - - protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) - { - if (documentNode.DocumentKind != ComponentDocumentClassifierPass.ComponentDocumentKind) - { - return; - } - - var visitor = new Visitor(); - visitor.Visit(documentNode); - } - - private class Visitor : IntermediateNodeWalker, IExtensionIntermediateNodeVisitor - { - public void VisitExtension(HtmlElementIntermediateNode node) - { - // Disallow - - } -"); - - var documentNode = Lower(document); - - // Act - Pass.Execute(document, documentNode); - - // Assert - Assert.Empty(documentNode.FindDescendantNodes()); - } - - // The unclosed tag will have errors, so we won't rewrite it or its parent. - [Fact] - public void Execute_CannotRewriteHtml_Errors() - { - // Arrange - var document = CreateDocument(@" - - -"); - - var documentNode = Lower(document); - - // Act - Pass.Execute(document, documentNode); - - // Assert - Assert.Empty(documentNode.FindDescendantNodes()); - } - - [Fact] - public void Execute_RewritesHtml_MismatchedClosingTag() - { - // Arrange - var document = CreateDocument(@" - -
-
rewriteme
- -"); - - var expected = NormalizeContent("
rewriteme
\n "); - - var documentNode = Lower(document); - - // Act - Pass.Execute(document, documentNode); - - // Assert - var block = documentNode.FindDescendantNodes().Single(); - Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true); - } - - private string NormalizeContent(string content) - { - // Test inputs frequently have leading space for readability. - content = content.TrimStart(); - - // Normalize newlines since we are testing lengths of things. - content = content.Replace("\r", ""); - content = content.Replace("\n", "\r\n"); - - return content; - } - - private RazorCodeDocument CreateDocument(string content) - { - // Normalize newlines since we are testing lengths of things. - content = content.Replace("\r", ""); - content = content.Replace("\n", "\r\n"); - - var source = RazorSourceDocument.Create(content, "test.cshtml"); - return RazorCodeDocument.Create(source); - } - - private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument) - { - for (var i = 0; i < Engine.Phases.Count; i++) - { - var phase = Engine.Phases[i]; - if (phase is IRazorCSharpLoweringPhase) - { - break; - } - - phase.Execute(codeDocument); - } - - var document = codeDocument.GetDocumentIntermediateNode(); - Engine.Features.OfType().Single().Execute(codeDocument, document); - return document; - } - - private class StaticTagHelperFeature : ITagHelperFeature - { - public RazorEngine Engine { get; set; } - - public List TagHelpers { get; set; } - - public IReadOnlyList GetDescriptors() - { - return TagHelpers; - } - } - } -} \ No newline at end of file diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/Microsoft.AspNetCore.Components.Razor.Extensions.Test.csproj b/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/Microsoft.AspNetCore.Components.Razor.Extensions.Test.csproj deleted file mode 100644 index e19722c89d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/Microsoft.AspNetCore.Components.Razor.Extensions.Test.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - netcoreapp3.0 - - false - - - true - 7.1 - - - - - - - - - - - - - - - - - - - - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/NodeAssert.cs b/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/NodeAssert.cs deleted file mode 100644 index 766cb81b17..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/NodeAssert.cs +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Text; -using Microsoft.AspNetCore.Razor.Language.Intermediate; -using Xunit; - -namespace Microsoft.AspNetCore.Components.Razor -{ - internal static class NodeAssert - { - public static HtmlAttributeIntermediateNode Attribute(IntermediateNode node, string attributeName, string attributeValue) - { - Assert.NotNull(node); - - var attributeNode = Assert.IsType(node); - Assert.Equal(attributeName, attributeNode.AttributeName); - - var attributeValueNode = Assert.IsType(Assert.Single(attributeNode.Children)); - var actual = new StringBuilder(); - for (var i = 0; i < attributeValueNode.Children.Count; i++) - { - var token = Assert.IsType(attributeValueNode.Children[i]); - Assert.Equal(TokenKind.Html, token.Kind); - actual.Append(token.Content); - } - - Assert.Equal(attributeValue, actual.ToString()); - - return attributeNode; - } - - public static HtmlAttributeIntermediateNode Attribute(IntermediateNodeCollection nodes, string attributeName, string attributeValue) - { - Assert.NotNull(nodes); - return Attribute(Assert.Single(nodes), attributeName, attributeValue); - } - - public static HtmlContentIntermediateNode Content(IntermediateNode node, string content, bool trim = true) - { - Assert.NotNull(node); - - var contentNode = Assert.IsType(node); - - var actual = new StringBuilder(); - for (var i = 0; i < contentNode.Children.Count; i++) - { - var token = Assert.IsType(contentNode.Children[i]); - Assert.Equal(TokenKind.Html, token.Kind); - actual.Append(token.Content); - } - - Assert.Equal(content, trim ? actual.ToString().Trim() : actual.ToString()); - return contentNode; - } - - public static HtmlContentIntermediateNode Content(IntermediateNodeCollection nodes, string content, bool trim = true) - { - Assert.NotNull(nodes); - return Content(Assert.Single(nodes), content, trim); - } - - public static HtmlAttributeIntermediateNode CSharpAttribute(IntermediateNode node, string attributeName, string attributeValue) - { - Assert.NotNull(node); - - var attributeNode = Assert.IsType(node); - Assert.Equal(attributeName, attributeNode.AttributeName); - - var attributeValueNode = Assert.IsType(Assert.Single(attributeNode.Children)); - var actual = new StringBuilder(); - for (var i = 0; i < attributeValueNode.Children.Count; i++) - { - var token = Assert.IsType(attributeValueNode.Children[i]); - Assert.Equal(TokenKind.CSharp, token.Kind); - actual.Append(token.Content); - } - - Assert.Equal(attributeValue, actual.ToString()); - - return attributeNode; - } - - public static HtmlAttributeIntermediateNode CSharpAttribute(IntermediateNodeCollection nodes, string attributeName, string attributeValue) - { - Assert.NotNull(nodes); - return Attribute(Assert.Single(nodes), attributeName, attributeValue); - } - - public static HtmlElementIntermediateNode Element(IntermediateNode node, string tagName) - { - Assert.NotNull(node); - - var elementNode = Assert.IsType(node); - Assert.Equal(tagName, elementNode.TagName); - return elementNode; - } - - public static HtmlElementIntermediateNode Element(IntermediateNodeCollection nodes, string tagName) - { - Assert.NotNull(nodes); - return Element(Assert.Single(nodes), tagName); - } - - public static HtmlContentIntermediateNode Whitespace(IntermediateNode node) - { - Assert.NotNull(node); - - var contentNode = Assert.IsType(node); - for (var i = 0; i < contentNode.Children.Count; i++) - { - var token = Assert.IsType(contentNode.Children[i]); - Assert.Equal(TokenKind.Html, token.Kind); - Assert.True(string.IsNullOrWhiteSpace(token.Content)); - } - - return contentNode; - } - - public static HtmlContentIntermediateNode Whitespace(IntermediateNodeCollection nodes) - { - Assert.NotNull(nodes); - return Whitespace(Assert.Single(nodes)); - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/RefTagHelperDescriptorProviderTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/RefTagHelperDescriptorProviderTest.cs deleted file mode 100644 index 89b5ffd6f7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/RefTagHelperDescriptorProviderTest.cs +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Razor.Language; -using System.Linq; -using Xunit; - -namespace Microsoft.AspNetCore.Components.Razor -{ - public class RefTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest - { - [Fact] - public void Execute_CreatesDescriptor() - { - // Arrange - var context = TagHelperDescriptorProviderContext.Create(); - var provider = new RefTagHelperDescriptorProvider(); - - // Act - provider.Execute(context); - - // Assert - var matches = context.Results.Where(result => result.IsRefTagHelper()); - var item = Assert.Single(matches); - - Assert.Empty(item.AllowedChildTags); - Assert.Null(item.TagOutputHint); - Assert.Empty(item.Diagnostics); - Assert.False(item.HasErrors); - Assert.Equal(BlazorMetadata.Ref.TagHelperKind, item.Kind); - Assert.Equal(BlazorMetadata.Ref.RuntimeName, item.Metadata[TagHelperMetadata.Runtime.Name]); - Assert.False(item.IsDefaultKind()); - Assert.False(item.KindUsesDefaultTagHelperRuntime()); - - Assert.Equal( - "Populates the specified field or property with a reference to the element or component.", - item.Documentation); - - Assert.Equal("Microsoft.AspNetCore.Components", item.AssemblyName); - Assert.Equal("Ref", item.Name); - Assert.Equal("Microsoft.AspNetCore.Components.Ref", item.DisplayName); - Assert.Equal("Microsoft.AspNetCore.Components.Ref", item.GetTypeName()); - - // The tag matching rule for a ref is just the attribute name "ref" - var rule = Assert.Single(item.TagMatchingRules); - Assert.Empty(rule.Diagnostics); - Assert.False(rule.HasErrors); - Assert.Null(rule.ParentTag); - Assert.Equal("*", rule.TagName); - Assert.Equal(TagStructure.Unspecified, rule.TagStructure); - - var requiredAttribute = Assert.Single(rule.Attributes); - Assert.Empty(requiredAttribute.Diagnostics); - Assert.Equal("ref", requiredAttribute.DisplayName); - Assert.Equal("ref", requiredAttribute.Name); - Assert.Equal(RequiredAttributeDescriptor.NameComparisonMode.FullMatch, requiredAttribute.NameComparison); - Assert.Null(requiredAttribute.Value); - Assert.Equal(RequiredAttributeDescriptor.ValueComparisonMode.None, requiredAttribute.ValueComparison); - - var attribute = Assert.Single(item.BoundAttributes); - Assert.Empty(attribute.Diagnostics); - Assert.False(attribute.HasErrors); - Assert.Equal(BlazorMetadata.Ref.TagHelperKind, attribute.Kind); - Assert.False(attribute.IsDefaultKind()); - Assert.False(attribute.HasIndexer); - Assert.Null(attribute.IndexerNamePrefix); - Assert.Null(attribute.IndexerTypeName); - Assert.False(attribute.IsIndexerBooleanProperty); - Assert.False(attribute.IsIndexerStringProperty); - - Assert.Equal( - "Populates the specified field or property with a reference to the element or component.", - attribute.Documentation); - - Assert.Equal("ref", attribute.Name); - Assert.Equal("Ref", attribute.GetPropertyName()); - Assert.Equal("object Microsoft.AspNetCore.Components.Ref.Ref", attribute.DisplayName); - Assert.Equal("System.Object", attribute.TypeName); - Assert.False(attribute.IsStringProperty); - Assert.False(attribute.IsBooleanProperty); - Assert.False(attribute.IsEnum); - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/xunit.runner.json b/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/xunit.runner.json deleted file mode 100644 index 6ce741b6c0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/xunit.runner.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "shadowCopy": false -} \ No newline at end of file From 0dd1bf8cd3b9dec3f41d0cc7992069e40eebeb53 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Sat, 29 Dec 2018 16:06:13 -0800 Subject: [PATCH 42/80] Make the tests pass - Remove baseline tests. Those live with tooling - Unskip tests that should have been fixed years ago - Fix rendering test infrastructure --- .../BindRazorIntegrationTest.cs | 7 +- .../ChildContentRazorIntegrationTest.cs | 178 +- .../CodeGenerationTestBase.cs | 2440 ----------------- .../ComponentDiscoveryRazorIntegrationTest.cs | 127 - .../ComponentRenderingRazorIntegrationTest.cs | 29 +- .../DeclarationRazorIntegrationTest.cs | 168 -- .../DesignTimeCodeGenerationTest.cs | 10 - .../DiagnosticRazorIntegrationTest.cs | 65 - .../DirectiveRazorIntegrationTest.cs | 7 +- .../FilePathRazorIntegrationTest.cs | 48 - .../GenericComponentRazorIntegrationTest.cs | 54 +- .../Razor/InitializeTestFileAttribute.cs | 29 - .../Razor/IntermediateNodeSerializer.cs | 46 - .../Razor/IntermediateNodeVerifier.cs | 275 -- .../Razor/IntermediateNodeWriter.cs | 316 --- .../Razor/RazorDiagnosticSerializer.cs | 13 - .../Razor/SourceMappingsSerializer.cs | 47 - .../Razor/VirtualProjectItem.cs | 15 +- .../RazorBaselineIntegrationTestBase.cs | 211 -- .../RazorIntegrationTestBase.cs | 98 +- .../RenderingRazorIntegrationTest.cs | 25 +- .../RuntimeCodeGenerationTest.cs | 9 - .../TemplateRazorIntegrationTest.cs | 125 - .../TypingTest.cs | 94 - .../WorkingDirectoryRazorIntegrationTest.cs | 41 - .../Infrastructure/BrowserTestBase.cs | 2 +- .../Tests/ComponentRenderingTest.cs | 2 +- 27 files changed, 162 insertions(+), 4319 deletions(-) delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/CodeGenerationTestBase.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentDiscoveryRazorIntegrationTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DeclarationRazorIntegrationTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DesignTimeCodeGenerationTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DiagnosticRazorIntegrationTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/FilePathRazorIntegrationTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/InitializeTestFileAttribute.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeSerializer.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeVerifier.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeWriter.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/RazorDiagnosticSerializer.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/SourceMappingsSerializer.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorBaselineIntegrationTestBase.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeCodeGenerationTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TemplateRazorIntegrationTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TypingTest.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/WorkingDirectoryRazorIntegrationTest.cs diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs index fb913c4fe0..7bf9eecd1f 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs @@ -2,14 +2,19 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; +using Xunit.Abstractions; namespace Microsoft.AspNetCore.Components.Build.Test { public class BindRazorIntegrationTest : RazorIntegrationTestBase { + public BindRazorIntegrationTest(ITestOutputHelper output) + : base(output) + { + } + internal override bool UseTwoPhaseCompilation => true; [Fact] diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs index dcedc6e68f..45dedb4014 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs @@ -1,13 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Linq; -using Microsoft.AspNetCore.Components.Razor; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; using Microsoft.CodeAnalysis.CSharp; using Xunit; +using Xunit.Abstractions; namespace Microsoft.AspNetCore.Components.Build.Test { @@ -84,6 +82,11 @@ namespace Test } "); + public ChildContentRazorIntegrationTest(ITestOutputHelper output) + : base(output) + { + } + internal override bool UseTwoPhaseCompilation => true; [Fact] @@ -410,174 +413,5 @@ namespace Test frame => AssertFrame.Text(frame, " Content", 9), frame => AssertFrame.Text(frame, "Bye!", 11)); } - - [Fact] - public void Render_ChildContent_AttributeAndBody_ProducesDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(RenderChildContentComponent); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -@{ RenderFragment template = @
@context.ToLowerInvariant()
; } - -Some Content -"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Same(BlazorDiagnosticFactory.ChildContentSetByAttributeAndBody.Id, diagnostic.Id); - } - - [Fact] - public void Render_ChildContent_AttributeAndExplicitChildContent_ProducesDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(RenderChildContentComponent); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -@{ RenderFragment template = @
@context.ToLowerInvariant()
; } - - -Some Content - -"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Same(BlazorDiagnosticFactory.ChildContentSetByAttributeAndBody.Id, diagnostic.Id); - } - - [Fact] - public void Render_ChildContent_ExplicitChildContent_UnrecogizedContent_ProducesDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(RenderChildContentComponent); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - - -@somethingElse -"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Same(BlazorDiagnosticFactory.ChildContentMixedWithExplicitChildContent.Id, diagnostic.Id); - Assert.Equal( - "Unrecognized child content inside component 'RenderChildContent'. The component 'RenderChildContent' accepts " + - "child content through the following top-level items: 'ChildContent'.", - diagnostic.GetMessage()); - } - - [Fact] - public void Render_ChildContent_ExplicitChildContent_UnrecogizedElement_ProducesDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(RenderChildContentComponent); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - - - -"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Same(BlazorDiagnosticFactory.ChildContentMixedWithExplicitChildContent.Id, diagnostic.Id); - } - - [Fact] - public void Render_ChildContent_ExplicitChildContent_UnrecogizedAttribute_ProducesDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(RenderChildContentComponent); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - - -"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Same(BlazorDiagnosticFactory.ChildContentHasInvalidAttribute.Id, diagnostic.Id); - } - - [Fact] - public void Render_ChildContent_ExplicitChildContent_InvalidParameterName_ProducesDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(RenderChildContentStringComponent); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - - -"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Same(BlazorDiagnosticFactory.ChildContentHasInvalidParameter.Id, diagnostic.Id); - } - - [Fact] - public void Render_ChildContent_ExplicitChildContent_RepeatedParameterName_GeneratesDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(RenderChildContentStringComponent); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - - - - - - -"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Same(BlazorDiagnosticFactory.ChildContentRepeatedParameterName.Id, diagnostic.Id); - Assert.Equal( - "The child content element 'ChildContent' of component 'RenderChildContentString' uses the same parameter name ('context') as enclosing child content " + - "element 'ChildContent' of component 'RenderChildContentString'. Specify the parameter name like: ' to resolve the ambiguity", - diagnostic.GetMessage()); - } - - [Fact] - public void Render_ChildContent_ContextParameterNameOnComponent_Invalid_ProducesDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(RenderChildContentStringComponent); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Same(BlazorDiagnosticFactory.ChildContentHasInvalidParameterOnComponent.Id, diagnostic.Id); - Assert.Equal( - "Invalid parameter name. The parameter name attribute 'Context' on component 'RenderChildContentString' can only include literal text.", - diagnostic.GetMessage()); - } } } diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/CodeGenerationTestBase.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/CodeGenerationTestBase.cs deleted file mode 100644 index aca9366cb9..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/CodeGenerationTestBase.cs +++ /dev/null @@ -1,2440 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Linq; -using Xunit; - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - public abstract class CodeGenerationTestBase : RazorBaselineIntegrationTestBase - { - internal override bool UseTwoPhaseCompilation => true; - - public CodeGenerationTestBase() - : base(generateBaselines: false) - { - } - - #region Basics - - [Fact] - public void ChildComponent_Simple() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_WithParameters() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class SomeType - { - } - - public class MyComponent : ComponentBase - { - [Parameter] int IntProperty { get; set; } - [Parameter] bool BoolProperty { get; set; } - [Parameter] string StringProperty { get; set; } - [Parameter] SomeType ObjectProperty { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ComponentWithTypeParameters() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@using Microsoft.AspNetCore.Components; -@typeparam TItem1 -@typeparam TItem2 - -

Item1

-@foreach (var item2 in Items2) -{ -

- @ChildContent(item2); -

-} -@functions { - [Parameter] TItem1 Item1 { get; set; } - [Parameter] List Items2 { get; set; } - [Parameter] RenderFragment ChildContent { get; set; } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_WithExplicitStringParameter() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - string StringProperty { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_WithNonPropertyAttributes() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ComponentParameter_TypeMismatch_ReportsDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class CoolnessMeter : ComponentBase - { - [Parameter] private int Coolness { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - - var assembly = CompileToAssembly(generated, throwOnFailure: false); - // This has some errors - Assert.Collection( - assembly.Diagnostics.OrderBy(d => d.Id), - d => Assert.Equal("CS1503", d.Id)); - } - - #endregion - - #region Bind - - [Fact] - public void BindToComponent_SpecifiesValue_WithMatchingProperties() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - int Value { get; set; } - - [Parameter] - Action ValueChanged { get; set; } - } -}")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public int ParentValue { get; set; } = 42; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BindToComponent_TypeChecked_WithMatchingProperties() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - int Value { get; set; } - - [Parameter] - Action ValueChanged { get; set; } - } -}")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public string ParentValue { get; set; } = ""42""; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - - var assembly = CompileToAssembly(generated, throwOnFailure: false); - // This has some errors - Assert.Collection( - assembly.Diagnostics.OrderBy(d => d.Id), - d => Assert.Equal("CS0029", d.Id), - d => Assert.Equal("CS1503", d.Id)); - } - - [Fact] - public void BindToComponent_SpecifiesValue_WithoutMatchingProperties() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase, IComponent - { - void IComponent.SetParameters(ParameterCollection parameters) - { - } - } -}")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public int ParentValue { get; set; } = 42; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - int Value { get; set; } - - [Parameter] - Action OnChanged { get; set; } - } -}")); - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public int ParentValue { get; set; } = 42; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase, IComponent - { - void IComponent.SetParameters(ParameterCollection parameters) - { - } - } -}")); - - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public int ParentValue { get; set; } = 42; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BindToElement_WritesAttributes() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - [BindElement(""div"", null, ""myvalue"", ""myevent"")] - public static class BindAttributes - { - } -}")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -
-@functions { - public string ParentValue { get; set; } = ""hi""; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BindToElementWithSuffix_WritesAttributes() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - [BindElement(""div"", ""value"", ""myvalue"", ""myevent"")] - public static class BindAttributes - { - } -}")); - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -
-@functions { - public string ParentValue { get; set; } = ""hi""; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BuiltIn_BindToInputWithoutType_WritesAttributes() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public int ParentValue { get; set; } = 42; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BuiltIn_BindToInputText_WithFormat_WritesAttributes() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - - public string Format { get; set; } = ""MM/dd/yyyy""; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BuiltIn_BindToInputText_WritesAttributes() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public int ParentValue { get; set; } = 42; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BuiltIn_BindToInputCheckbox_WritesAttributes() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public bool Enabled { get; set; } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BindToElementFallback_WritesAttributes() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public int ParentValue { get; set; } = 42; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BindToElementFallback_WithFormat_WritesAttributes() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - #endregion - - #region Child Content - - [Fact] - public void ChildComponent_WithChildContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - string MyAttr { get; set; } - - [Parameter] - RenderFragment ChildContent { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -Some textNested text"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_WithGenericChildContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - string MyAttr { get; set; } - - [Parameter] - RenderFragment ChildContent { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -Some text@context.ToLowerInvariant()"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - - [Fact] - public void ChildComponent_WithGenericChildContent_SetsParameterName() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - string MyAttr { get; set; } - - [Parameter] - RenderFragment ChildContent { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - - Some text@item.ToLowerInvariant() - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - string MyAttr { get; set; } - - [Parameter] - RenderFragment ChildContent { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - - Some text@item.ToLowerInvariant() - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_WithElementOnlyChildContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - RenderFragment ChildContent { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -hello"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_WithExplicitChildContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - RenderFragment ChildContent { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -hello"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_WithExplicitGenericChildContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - RenderFragment ChildContent { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -@context"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void MultipleExplictChildContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - RenderFragment Header { get; set; } - - [Parameter] - RenderFragment Footer { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -
Hi!
-
@(""bye!"")
-"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BodyAndAttributeChildContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - RenderFragment Header { get; set; } - - RenderFragment ChildContent { get; set; } - - [Parameter] - RenderFragment Footer { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -@{ RenderFragment header = (context) => @
@context.ToLowerInvariant()
; } - - Some Content -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void BodyAndExplicitChildContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - RenderFragment Header { get; set; } - - [Parameter] - RenderFragment ChildContent { get; set; } - - [Parameter] - RenderFragment Footer { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -@{ RenderFragment header = (context) => @
@context.ToLowerInvariant()
; } - - Some Content -
Bye!
-"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - #endregion - - #region Directives - - [Fact] - public void ChildComponent_WithPageDirective() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -@page ""/MyPage"" -@page ""/AnotherRoute/{id}"" -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - #endregion - - #region Event Handlers - - [Fact] - public void ChildComponent_WithLambdaEventHandler() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - Action OnClick { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - { Increment(); })""/> - -@functions { - private int counter; - private void Increment() { - counter++; - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - // Regression test for #954 - we need to allow arbitrary event handler - // attributes with weak typing. - [Fact] - public void ChildComponent_WithWeaklyTypeEventHandler() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class DynamicElement : ComponentBase - { - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - -@functions { - private Action OnClick { get; set; } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_WithExplicitEventHandler() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - Action OnClick { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - -@functions { - private int counter; - private void Increment(UIEventArgs e) { - counter++; - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void EventHandler_OnElement_WithString() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void EventHandler_OnElement_WithNoArgsLambdaDelegate() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" - { })"" />"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void EventHandler_OnElement_WithEventArgsLambdaDelegate() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" - { })"" />"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void EventHandler_OnElement_WithNoArgMethodGroup() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" - -@functions { - void OnClick() { - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void EventHandler_OnElement_WithEventArgsMethodGroup() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" - -@functions { - void OnClick(UIMouseEventArgs e) { - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" - -@functions { - void OnClick(UIEventArgs e) { - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void AsyncEventHandler_OnElement_Action_MethodGroup() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@using System.Threading.Tasks - -@functions { - Task OnClick() - { - return Task.CompletedTask; - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@using System.Threading.Tasks - -@functions { - Task OnClick(UIMouseEventArgs e) - { - return Task.CompletedTask; - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void AsyncEventHandler_OnElement_Action_Lambda() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@using System.Threading.Tasks - await Task.Delay(10)"" /> -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void AsyncEventHandler_OnElement_ActionEventArgs_Lambda() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@using System.Threading.Tasks - await Task.Delay(10)"" /> -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void EventHandler_OnElement_WithLambdaDelegate() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" - { })"" />"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void EventHandler_OnElement_WithDelegate() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" - -@functions { - void OnClick(UIMouseEventArgs e) { - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - #endregion - - #region Generics - - [Fact] - public void ChildComponent_Generic() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem Item { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_Generic_TypeInference() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem Item { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_Generic_TypeInference_Multiple() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem Item { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_GenericWeaklyTypedAttribute() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem Item { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_GenericWeaklyTypedAttribute_TypeInference() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem Item { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_GenericBind() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - TItem Item { get; set; } - - [Parameter] - Action ItemChanged { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - string Value; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_GenericBind_TypeInference() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] - TItem Item { get; set; } - - [Parameter] - Action ItemChanged { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - string Value; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_GenericBindWeaklyTyped() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - string Value; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_GenericBindWeaklyTyped_TypeInference() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem Value { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - string Value; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_GenericChildContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem Item { get; set; } - - [Parameter] RenderFragment ChildContent { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -
@context.ToLower()
-"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_GenericChildContent_TypeInference() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem Item { get; set; } - - [Parameter] RenderFragment ChildContent { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -
@context.ToLower()
-"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_MultipleGenerics() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem1 Item { get; set; } - - [Parameter] RenderFragment ChildContent { get; set; } - - [Parameter] RenderFragment AnotherChildContent { get; set; } - - public class Context - { - public TItem2 Item { get; set; } - } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -
@context.ToLower()
 - - @System.Math.Max(0, item.Item); - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ChildComponent_MultipleGenerics_TypeInference() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System.Collections.Generic; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem1 Item { get; set; } - - [Parameter] List Items { get; set; } - - [Parameter] RenderFragment ChildContent { get; set; } - - [Parameter] RenderFragment AnotherChildContent { get; set; } - - public class Context - { - public TItem2 Item { get; set; } - } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -())> -
@context.ToLower()
 - - @System.Math.Max(0, item.Item); - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void GenericComponent_WithComponentRef() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem Item { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - -@functions { - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } -} -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void GenericComponent_WithComponentRef_TypeInference() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] TItem Item { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - -@functions { - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } -} -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - #endregion - - #region Ref - - [Fact] - public void Element_WithRef() - { - // Arrange/Act - var generated = CompileToCSharp(@" -Hello - -@functions { - private Microsoft.AspNetCore.Components.ElementRef myElem; - public void Foo() { System.GC.KeepAlive(myElem); } -} -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void Component_WithRef() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - } -} -")); - - // Arrange/Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - -@functions { - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } -} -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void Component_WithRef_WithChildContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - } -} -")); - - // Arrange/Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - Some further content - - -@functions { - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } -} -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - #endregion - - #region Templates - - [Fact] - public void RazorTemplate_InCodeBlock() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@{ - RenderFragment p = (person) => @
@person.Name
; -} -@functions { - class Person - { - public string Name { get; set; } - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void RazorTemplate_InExplicitExpression() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@(RenderPerson((person) => @
@person.Name
)) -@functions { - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void RazorTemplate_NonGeneric_InImplicitExpression() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@RenderPerson(@
HI
) -@functions { - object RenderPerson(RenderFragment p) => null; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void RazorTemplate_Generic_InImplicitExpression() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -@RenderPerson((person) => @
@person.Name
) -@functions { - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void RazorTemplate_ContainsComponent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] string Name { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper ""*, TestAssembly"" -@{ - RenderFragment p = (person) => @
; -} -@functions { - class Person - { - public string Name { get; set; } - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - // Targeted at the logic that assigns 'builder' names - [Fact] - public void RazorTemplate_FollowedByComponent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] string Name { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper ""*, TestAssembly"" -@{ - RenderFragment p = (person) => @
; -} - -@(""hello, world!"") - - -@functions { - class Person - { - public string Name { get; set; } - } -}"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void RazorTemplate_NonGeneric_AsComponentParameter() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] RenderFragment Template { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper ""*, TestAssembly"" -@{ RenderFragment template = @
Joey
; } - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void RazorTemplate_Generic_AsComponentParameter() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] RenderFragment PersonTemplate { get; set; } - } - - public class Person - { - public string Name { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper ""*, TestAssembly"" -@{ RenderFragment template = (person) => @
@person.Name
; } - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void RazorTemplate_AsComponentParameter_MixedContent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] RenderFragment Template { get; set; } - } - - public class Context - { - public int Index { get; set; } - public string Item { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper ""*, TestAssembly"" -@{ RenderFragment template = (context) => @
  • #@context.Index - @context.Item.ToLower()
    • ; } - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - #endregion - - #region Whitespace - - [Fact] - public void LeadingWhiteSpace_WithDirective() - { - // Arrange/Act - var generated = CompileToCSharp(@" - -@using System - -

    Hello

    "); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void LeadingWhiteSpace_WithCSharpExpression() - { - // Arrange/Act - var generated = CompileToCSharp(@" - -@(""My value"") - -

    Hello

    "); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void LeadingWhiteSpace_WithComponent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class SomeOtherComponent : ComponentBase - { - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - - -

    Hello

    "); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void TrailingWhiteSpace_WithDirective() - { - // Arrange/Act - var generated = CompileToCSharp(@" -

    Hello

    - -@page ""/my/url"" - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void TrailingWhiteSpace_WithCSharpExpression() - { - // Arrange/Act - var generated = CompileToCSharp(@" -

    Hello

    - -@(""My value"") - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void TrailingWhiteSpace_WithComponent() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class SomeOtherComponent : ComponentBase - { - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -

    Hello

    - - - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - #endregion - - #region Misc - - [Fact] // We don't process - we just skip them - public void Component_WithDocType() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" - -
    -
    "); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void ScriptTag_WithErrorSuppressed() - { - // Arrange/Act - var generated = CompileToCSharp(@" -
    - -
    -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] // https://github.com/aspnet/Blazor/issues/597 - public void Regression_597() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class Counter : ComponentBase - { - public int Count { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - -@functions { - string y = null; -} -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void Regression_609() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class User : ComponentBase - { - public string Name { get; set; } - public Action NameChanged { get; set; } - public bool IsActive { get; set; } - public Action IsActiveChanged { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly - - -@functions { - public string UserName { get; set; } - public bool UserIsActive { get; set; } -} -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] // https://github.com/aspnet/Blazor/issues/772 - public void Regression_772() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class SurveyPrompt : ComponentBase - { - [Parameter] private string Title { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -@page ""/"" - -

    Hello, world!

    - -Welcome to your new app. - - d.Id), - d => Assert.Equal("RZ1034", d.Id), - d => Assert.Equal("RZ1035", d.Id)); - } - - [Fact] // https://github.com/aspnet/Blazor/issues/773 - public void Regression_773() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class SurveyPrompt : ComponentBase - { - [Parameter] private string Title { get; set; } - } -} -")); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -@page ""/"" - -

    Hello, world!

    - -Welcome to your new app. - -Test!
    "" /> -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void Regression_784() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" -

    -@functions { - public string ParentBgColor { get; set; } = ""#FFFFFF""; - - public void OnComponentHover(UIMouseEventArgs e) - { - } -} -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - [Fact] - public void EventHandlerTagHelper_EscapeQuotes() - { - // Act - var generated = CompileToCSharp(@" - -"); - - // Assert - AssertDocumentNodeMatchesBaseline(generated.CodeDocument); - AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); - CompileToAssembly(generated); - } - - #endregion - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentDiscoveryRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentDiscoveryRazorIntegrationTest.cs deleted file mode 100644 index ad3bdd8d12..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentDiscoveryRazorIntegrationTest.cs +++ /dev/null @@ -1,127 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using System.Text; -using Microsoft.AspNetCore.Components.Test.Helpers; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.CodeAnalysis.CSharp; -using Xunit; - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - public class ComponentDiscoveryRazorIntegrationTest : RazorIntegrationTestBase - { - internal override bool UseTwoPhaseCompilation => true; - - [Fact] - public void ComponentDiscovery_CanFindComponent_DefinedinCSharp() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - } -} -")); - - // Act - var result = CompileToCSharp("@addTagHelper *, TestAssembly"); - - // Assert - var bindings = result.CodeDocument.GetTagHelperContext(); - Assert.Single(bindings.TagHelpers, t => t.Name == "Test.MyComponent"); - } - - [Fact] - public void ComponentDiscovery_CanFindComponent_WithNamespace_DefinedinCSharp() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test.AnotherNamespace -{ - public class MyComponent : ComponentBase - { - } -} -")); - - // Act - var result = CompileToCSharp("@addTagHelper *, TestAssembly"); - - // Assert - var bindings = result.CodeDocument.GetTagHelperContext(); - Assert.Single(bindings.TagHelpers, t => t.Name == "Test.AnotherNamespace.MyComponent"); - } - - [Fact] - public void ComponentDiscovery_CanFindComponent_DefinedinCshtml() - { - // Arrange - - // Act - var result = CompileToCSharp("UniqueName.cshtml", "@addTagHelper *, TestAssembly"); - - // Assert - var bindings = result.CodeDocument.GetTagHelperContext(); - Assert.Single(bindings.TagHelpers, t => t.Name == "Test.UniqueName"); - } - - [Fact] - public void ComponentDiscovery_CanFindComponent_BuiltIn() - { - // Arrange - - // Act - var result = CompileToCSharp("@addTagHelper *, Microsoft.AspNetCore.Components"); - - // Assert - var bindings = result.CodeDocument.GetTagHelperContext(); - Assert.Single(bindings.TagHelpers, t => t.Name == "Microsoft.AspNetCore.Components.Routing.NavLink"); - } - - [Fact] - public void ComponentDiscovery_CanFindComponent_WithTypeParameter() - { - // Arrange - - // Act - var result = CompileToCSharp("UniqueName.cshtml", @" -@addTagHelper *, TestAssembly -@typeparam TItem -@functions { - [Parameter] TItem Item { get; set; } -}"); - - // Assert - var bindings = result.CodeDocument.GetTagHelperContext(); - Assert.Single(bindings.TagHelpers, t => t.Name == "Test.UniqueName"); - } - - [Fact] - public void ComponentDiscovery_CanFindComponent_WithMultipleTypeParameters() - { - // Arrange - - // Act - var result = CompileToCSharp("UniqueName.cshtml", @" -@addTagHelper *, TestAssembly -@typeparam TItem1 -@typeparam TItem2 -@typeparam TItem3 -@functions { - [Parameter] TItem1 Item { get; set; } -}"); - - // Assert - var bindings = result.CodeDocument.GetTagHelperContext(); - Assert.Single(bindings.TagHelpers, t => t.Name == "Test.UniqueName"); - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs index 42c2848e24..3a832e0ec9 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs @@ -3,15 +3,20 @@ using System; using System.Linq; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; +using Xunit.Abstractions; namespace Microsoft.AspNetCore.Components.Build.Test { public class ComponentRenderingRazorIntegrationTest : RazorIntegrationTestBase { + public ComponentRenderingRazorIntegrationTest(ITestOutputHelper output) + : base(output) + { + } + internal override bool UseTwoPhaseCompilation => true; [Fact] @@ -469,12 +474,11 @@ namespace Test frame => AssertFrame.Attribute(frame, "style", "background: #FFFFFF;", 2)); } - // Text nodes decode HTML entities - [Fact] + [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/6185")] public void Render_Component_HtmlEncoded() { // Arrange - var component = CompileToComponent(@"<span>Hi</span>"); + var component = CompileToComponent(@"<span>Hi</span>"); // Act var frames = GetRenderTree(component); @@ -485,8 +489,23 @@ namespace Test frame => AssertFrame.Text(frame, "Hi")); } - // Integration test for HTML block rewriting [Fact] + public void Render_Component_HtmlBlockEncoded() + { + // Arrange + var component = CompileToComponent(@"

    <span>Hi</span>
    "); + + // Act + var frames = GetRenderTree(component); + + // Assert + Assert.Collection( + frames, + frame => AssertFrame.Markup(frame, "
    <span>Hi</span>
    ")); + } + + // Integration test for HTML block rewriting + [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/6183")] public void Render_HtmlBlock_Integration() { // Arrange diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DeclarationRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DeclarationRazorIntegrationTest.cs deleted file mode 100644 index 59b776ca11..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DeclarationRazorIntegrationTest.cs +++ /dev/null @@ -1,168 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using System.Text; -using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Razor; -using Microsoft.AspNetCore.Razor.Language; -using Xunit; - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - public class DeclarationRazorIntegrationTest : RazorIntegrationTestBase - { - internal override RazorConfiguration Configuration => BlazorExtensionInitializer.DeclarationConfiguration; - - [Fact] - public void DeclarationConfiguration_IncludesFunctions() - { - // Arrange & Act - var component = CompileToComponent(@" -@functions { - public string Value { get; set; } -}"); - - // Assert - var property = component.GetType().GetProperty("Value"); - Assert.NotNull(property); - Assert.Same(typeof(string), property.PropertyType); - } - - [Fact] - public void DeclarationConfiguration_IncludesInject() - { - // Arrange & Act - var component = CompileToComponent(@" -@inject string Value -"); - - // Assert - var property = component.GetType().GetProperty("Value", BindingFlags.NonPublic | BindingFlags.Instance); - Assert.NotNull(property); - Assert.Same(typeof(string), property.PropertyType); - } - - [Fact] - public void DeclarationConfiguration_IncludesUsings() - { - // Arrange & Act - var component = CompileToComponent(@" -@using System.Text -@inject StringBuilder Value -"); - - // Assert - var property = component.GetType().GetProperty("Value", BindingFlags.NonPublic | BindingFlags.Instance); - Assert.NotNull(property); - Assert.Same(typeof(StringBuilder), property.PropertyType); - } - - [Fact] - public void DeclarationConfiguration_IncludesInherits() - { - // Arrange & Act - var component = CompileToComponent($@" -@inherits {FullTypeName()} -"); - - // Assert - Assert.Same(typeof(BaseClass), component.GetType().BaseType); - } - - [Fact] - public void DeclarationConfiguration_IncludesImplements() - { - // Arrange & Act - var component = CompileToComponent($@" -@implements {FullTypeName()} -"); - - // Assert - var type = component.GetType(); - Assert.Contains(typeof(IDoCoolThings), component.GetType().GetInterfaces()); - } - - [Fact] - public void DeclarationConfiguration_RenderMethodIsEmpty() - { - // Arrange & Act - var component = CompileToComponent(@" - -@{ var message = ""hi""; } -@message - -"); - - var frames = GetRenderTree(component); - - // Assert - Assert.Empty(frames); - } - - [Fact] // Regression test for https://github.com/aspnet/Blazor/issues/453 - public void DeclarationConfiguration_FunctionsBlockHasLineMappings_MappingsApplyToError() - { - // Arrange & Act 1 - var generated = CompileToCSharp(@" -@functions { - public StringBuilder Builder { get; set; } -} -"); - - // Assert 1 - AssertSourceEquals(@" -// -#pragma warning disable 1591 -#pragma warning disable 0414 -#pragma warning disable 0649 -#pragma warning disable 0169 - -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - } - #pragma warning restore 1998 -#line 1 ""x:\dir\subdir\Test\TestComponent.cshtml"" - - public StringBuilder Builder { get; set; } - -#line default -#line hidden - } -} -#pragma warning restore 1591 -", generated); - - // Act 2 - var assembly = CompileToAssembly(generated, throwOnFailure: false); - - // Assert 2 - var diagnostic = Assert.Single(assembly.Diagnostics); - - // This error should map to line 2 of the generated file, the test - // says 1 because Roslyn's line/column data structures are 0-based. - var position = diagnostic.Location.GetMappedLineSpan(); - Assert.EndsWith(".cshtml", position.Path); - Assert.Equal(1, position.StartLinePosition.Line); - } - - public class BaseClass : ComponentBase - { - } - - public interface IDoCoolThings - { - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DesignTimeCodeGenerationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DesignTimeCodeGenerationTest.cs deleted file mode 100644 index 233df797ea..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DesignTimeCodeGenerationTest.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - public class DesignTimeCodeGenerationTest : CodeGenerationTestBase - { - internal override bool DesignTime => true; - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DiagnosticRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DiagnosticRazorIntegrationTest.cs deleted file mode 100644 index 8ffe06567f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DiagnosticRazorIntegrationTest.cs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Xunit; - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - public class DiagnosticRazorIntegrationTest : RazorIntegrationTestBase - { - [Fact] - public void RejectsEndTagWithNoStartTag() - { - // Arrange/Act - var result = CompileToCSharp( - "Line1\nLine2\nLine3"); - - // Assert - Assert.Collection(result.Diagnostics, - item => - { - Assert.Equal("BL9981", item.Id); - Assert.Equal("Unexpected closing tag 'mytag' with no matching start tag.", item.GetMessage()); - }); - } - - // This used to be a sugar syntax for lambdas, but we don't support that anymore - [Fact] - public void OldCodeBlockAttributeSyntax_ReportsError() - { - // Arrange/Act - var generated = CompileToCSharp(@" - -@functions { - public bool DidInvokeCode { get; set; } = false; -}"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Equal("BL9979", diagnostic.Id); - } - - [Fact] - public void RejectsScriptTag() - { - // Arrange/Act - var result = CompileToCSharp(@"Hello -
    - -
    -Goodbye"); - - // Assert - Assert.Collection(result.Diagnostics, - item => - { - Assert.Equal("BL9992", item.Id); - Assert.Equal("Script tags should not be placed inside components because they cannot be updated dynamically. To fix this, move the script tag to the 'index.html' file or another static location. For more information see https://go.microsoft.com/fwlink/?linkid=872131", item.GetMessage()); - Assert.Equal(2, item.Span.LineIndex); - Assert.Equal(4, item.Span.CharacterIndex); - }); - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DirectiveRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DirectiveRazorIntegrationTest.cs index 229956ccc3..abeec06791 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DirectiveRazorIntegrationTest.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/DirectiveRazorIntegrationTest.cs @@ -4,16 +4,21 @@ using System; using System.Linq; using System.Reflection; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Layouts; using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; +using Xunit.Abstractions; namespace Microsoft.AspNetCore.Components.Build.Test { // Integration tests for Blazor's directives public class DirectiveRazorIntegrationTest : RazorIntegrationTestBase { + public DirectiveRazorIntegrationTest(ITestOutputHelper output) + : base(output) + { + } + [Fact] public void ComponentsDoNotHaveLayoutAttributeByDefault() { diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/FilePathRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/FilePathRazorIntegrationTest.cs deleted file mode 100644 index 6358a38cbb..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/FilePathRazorIntegrationTest.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using Xunit; - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - // Integration tests focused on file path handling for class/namespace names - public class FilePathRazorIntegrationTest : RazorIntegrationTestBase - { - [Fact] - public void FileNameIsInvalidClassName_SanitizesInvalidClassName() - { - // Arrange - - // Act - var result = CompileToAssembly("Filename with spaces.cshtml", ""); - - // Assert - Assert.Empty(result.Diagnostics); - - var type = Assert.Single(result.Assembly.GetTypes()); - Assert.Equal(DefaultBaseNamespace, type.Namespace); - Assert.Equal("Filename_with_spaces", type.Name); - } - - [Theory] - [InlineData("ItemAtRoot.cs", "Test", "ItemAtRoot")] - [InlineData("Dir1\\MyFile.cs", "Test.Dir1", "MyFile")] - [InlineData("Dir1\\Dir2\\MyFile.cs", "Test.Dir1.Dir2", "MyFile")] - public void CreatesClassWithCorrectNameAndNamespace(string relativePath, string expectedNamespace, string expectedClassName) - { - // Arrange - relativePath = relativePath.Replace('\\', Path.DirectorySeparatorChar); - - // Act - var result = CompileToAssembly(relativePath, ""); - - // Assert - Assert.Empty(result.Diagnostics); - - var type = Assert.Single(result.Assembly.GetTypes()); - Assert.Equal(expectedNamespace, type.Namespace); - Assert.Equal(expectedClassName, type.Name); - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/GenericComponentRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/GenericComponentRazorIntegrationTest.cs index 3e37430259..395d676867 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/GenericComponentRazorIntegrationTest.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/GenericComponentRazorIntegrationTest.cs @@ -1,15 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Components.Razor; -using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.RenderTree; -using Microsoft.AspNetCore.Components.Test.Helpers; -using Microsoft.CodeAnalysis.CSharp; using System; using System.Collections.Generic; using System.Linq; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; +using Microsoft.CodeAnalysis.CSharp; using Xunit; +using Xunit.Abstractions; namespace Microsoft.AspNetCore.Components.Build.Test { @@ -81,6 +80,11 @@ namespace Test } "); + public GenericComponentRazorIntegrationTest(ITestOutputHelper output) + : base(output) + { + } + internal override bool UseTwoPhaseCompilation => true; [Fact] @@ -313,45 +317,5 @@ namespace Test frame => AssertFrame.Text(frame, "FOO", 1), frame => AssertFrame.Text(frame, "39", 2)); } - - [Fact] - public void GenericComponent_WithoutAnyTypeParameters_TriggersDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(GenericContextComponent); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Same(BlazorDiagnosticFactory.GenericComponentTypeInferenceUnderspecified.Id, diagnostic.Id); - Assert.Equal( - "The type of component 'GenericContext' cannot be inferred based on the values provided. Consider " + - "specifying the type arguments directly using the following attributes: 'TItem'.", - diagnostic.GetMessage()); - } - - [Fact] - public void GenericComponent_WithMissingTypeParameters_TriggersDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(MultipleGenericParameterComponent); - - // Act - var generated = CompileToCSharp(@" -@addTagHelper *, TestAssembly -"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Same(BlazorDiagnosticFactory.GenericComponentMissingTypeArgument.Id, diagnostic.Id); - Assert.Equal( - "The component 'MultipleGenericParameter' is missing required type arguments. " + - "Specify the missing types using the attributes: 'TItem2', 'TItem3'.", - diagnostic.GetMessage()); - } } } diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/InitializeTestFileAttribute.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/InitializeTestFileAttribute.cs deleted file mode 100644 index f166b3fcac..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/InitializeTestFileAttribute.cs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Reflection; -using Microsoft.AspNetCore.Components.Build.Test; -using Xunit.Sdk; - -namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests -{ - public class InitializeTestFileAttribute : BeforeAfterTestAttribute - { - public override void Before(MethodInfo methodUnderTest) - { - if (typeof(RazorBaselineIntegrationTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.ReflectedType.GetTypeInfo())) - { - var typeName = methodUnderTest.ReflectedType.Name; - RazorBaselineIntegrationTestBase.DirectoryPath = $"TestFiles/{typeName}/{methodUnderTest.Name}"; - } - } - - public override void After(MethodInfo methodUnderTest) - { - if (typeof(RazorBaselineIntegrationTestBase).GetTypeInfo().IsAssignableFrom(methodUnderTest.ReflectedType.GetTypeInfo())) - { - RazorBaselineIntegrationTestBase.DirectoryPath = null; - } - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeSerializer.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeSerializer.cs deleted file mode 100644 index 00b1449d42..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeSerializer.cs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests -{ - public static class IntermediateNodeSerializer - { - public static string Serialize(IntermediateNode node) - { - using (var writer = new StringWriter()) - { - var walker = new Walker(writer); - walker.Visit(node); - - return writer.ToString(); - } - } - - private class Walker : IntermediateNodeWalker - { - private readonly IntermediateNodeWriter _visitor; - private readonly TextWriter _writer; - - public Walker(TextWriter writer) - { - _visitor = new IntermediateNodeWriter(writer); - _writer = writer; - } - - public TextWriter Writer { get; } - - public override void VisitDefault(IntermediateNode node) - { - _visitor.Visit(node); - _writer.WriteLine(); - - _visitor.Depth++; - base.VisitDefault(node); - _visitor.Depth--; - } - } - } -} \ No newline at end of file diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeVerifier.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeVerifier.cs deleted file mode 100644 index f6b45c7b3a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeVerifier.cs +++ /dev/null @@ -1,275 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using Microsoft.AspNetCore.Razor.Language.Intermediate; -using Xunit; -using Xunit.Sdk; - -namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests -{ - public static class IntermediateNodeVerifier - { - public static void Verify(IntermediateNode node, string[] baseline) - { - var walker = new Walker(baseline); - walker.Visit(node); - walker.AssertReachedEndOfBaseline(); - } - - private class Walker : IntermediateNodeWalker - { - private readonly string[] _baseline; - private readonly IntermediateNodeWriter _visitor; - private readonly StringWriter _writer; - - private int _index; - - public Walker(string[] baseline) - { - _writer = new StringWriter(); - - _visitor = new IntermediateNodeWriter(_writer); - _baseline = baseline; - - } - - public TextWriter Writer { get; } - - public override void VisitDefault(IntermediateNode node) - { - var expected = _index < _baseline.Length ? _baseline[_index++] : null; - - // Write the node as text for comparison - _writer.GetStringBuilder().Clear(); - _visitor.Visit(node); - var actual = _writer.GetStringBuilder().ToString(); - - AssertNodeEquals(node, Ancestors, expected, actual); - - _visitor.Depth++; - base.VisitDefault(node); - _visitor.Depth--; - } - - public void AssertReachedEndOfBaseline() - { - // Since we're walking the nodes of our generated code there's the chance that our baseline is longer. - Assert.True(_baseline.Length == _index, "Not all lines of the baseline were visited!"); - } - - private void AssertNodeEquals(IntermediateNode node, IEnumerable ancestors, string expected, string actual) - { - if (string.Equals(expected, actual)) - { - // YAY!!! everything is great. - return; - } - - if (expected == null) - { - var message = "The node is missing from baseline."; - throw new IntermediateNodeBaselineException(node, Ancestors.ToArray(), expected, actual, message); - } - - int charsVerified = 0; - AssertNestingEqual(node, ancestors, expected, actual, ref charsVerified); - AssertNameEqual(node, ancestors, expected, actual, ref charsVerified); - AssertDelimiter(node, expected, actual, true, ref charsVerified); - AssertLocationEqual(node, ancestors, expected, actual, ref charsVerified); - AssertDelimiter(node, expected, actual, false, ref charsVerified); - AssertContentEqual(node, ancestors, expected, actual, ref charsVerified); - - throw new InvalidOperationException("We can't figure out HOW these two things are different. This is a bug."); - } - - private void AssertNestingEqual(IntermediateNode node, IEnumerable ancestors, string expected, string actual, ref int charsVerified) - { - var i = 0; - for (; i < expected.Length; i++) - { - if (expected[i] != ' ') - { - break; - } - } - - var failed = false; - var j = 0; - for (; j < i; j++) - { - if (actual.Length <= j || actual[j] != ' ') - { - failed = true; - break; - } - } - - if (actual.Length <= j + 1 || actual[j] == ' ') - { - failed = true; - } - - if (failed) - { - var message = "The node is at the wrong level of nesting. This usually means a child is missing."; - throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message); - } - - charsVerified = j; - } - - private void AssertNameEqual(IntermediateNode node, IEnumerable ancestors, string expected, string actual, ref int charsVerified) - { - var expectedName = GetName(expected, charsVerified); - var actualName = GetName(actual, charsVerified); - - if (!string.Equals(expectedName, actualName)) - { - var message = $"Node names are not equal."; - throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message); - } - - charsVerified += expectedName.Length; - } - - // Either both strings need to have a delimiter next or neither should. - private void AssertDelimiter(IntermediateNode node, string expected, string actual, bool required, ref int charsVerified) - { - if (charsVerified == expected.Length && required) - { - throw new InvalidOperationException($"Baseline text is not well-formed: '{expected}'."); - } - - if (charsVerified == actual.Length && required) - { - throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'."); - } - - if (charsVerified == expected.Length && charsVerified == actual.Length) - { - return; - } - - var expectedDelimiter = expected.IndexOf(" - ", charsVerified); - if (expectedDelimiter != charsVerified && expectedDelimiter != -1) - { - throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'."); - } - - var actualDelimiter = actual.IndexOf(" - ", charsVerified); - if (actualDelimiter != charsVerified && actualDelimiter != -1) - { - throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'."); - } - - Assert.Equal(expectedDelimiter, actualDelimiter); - - charsVerified += 3; - } - - private void AssertLocationEqual(IntermediateNode node, IEnumerable ancestors, string expected, string actual, ref int charsVerified) - { - var expectedLocation = GetLocation(expected, charsVerified); - var actualLocation = GetLocation(actual, charsVerified); - - if (!string.Equals(expectedLocation, actualLocation)) - { - var message = $"Locations are not equal."; - throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message); - } - - charsVerified += expectedLocation.Length; - } - - private void AssertContentEqual(IntermediateNode node, IEnumerable ancestors, string expected, string actual, ref int charsVerified) - { - var expectedContent = GetContent(expected, charsVerified); - var actualContent = GetContent(actual, charsVerified); - - if (!string.Equals(expectedContent, actualContent)) - { - var message = $"Contents are not equal."; - throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message); - } - - charsVerified += expectedContent.Length; - } - - private string GetName(string text, int start) - { - var delimiter = text.IndexOf(" - ", start); - if (delimiter == -1) - { - throw new InvalidOperationException($"Baseline text is not well-formed: '{text}'."); - } - - return text.Substring(start, delimiter - start); - } - - private string GetLocation(string text, int start) - { - var delimiter = text.IndexOf(" - ", start); - return delimiter == -1 ? text.Substring(start) : text.Substring(start, delimiter - start); - } - - private string GetContent(string text, int start) - { - return start == text.Length ? string.Empty : text.Substring(start); - } - - private class IntermediateNodeBaselineException : XunitException - { - public IntermediateNodeBaselineException(IntermediateNode node, IntermediateNode[] ancestors, string expected, string actual, string userMessage) - : base(Format(node, ancestors, expected, actual, userMessage)) - { - Node = node; - Expected = expected; - Actual = actual; - } - - public IntermediateNode Node { get; } - - public string Actual { get; } - - public string Expected { get; } - - private static string Format(IntermediateNode node, IntermediateNode[] ancestors, string expected, string actual, string userMessage) - { - var builder = new StringBuilder(); - builder.AppendLine(userMessage); - builder.AppendLine(); - - if (expected != null) - { - builder.Append("Expected: "); - builder.AppendLine(expected); - } - - if (actual != null) - { - builder.Append("Actual: "); - builder.AppendLine(actual); - } - - if (ancestors != null) - { - builder.AppendLine(); - builder.AppendLine("Path:"); - - foreach (var ancestor in ancestors) - { - builder.AppendLine(ancestor.ToString()); - } - } - - return builder.ToString(); - } - } - } - } -} \ No newline at end of file diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeWriter.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeWriter.cs deleted file mode 100644 index 4c0fa6a33d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeWriter.cs +++ /dev/null @@ -1,316 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Security.Cryptography; -using System.Text; -using Microsoft.AspNetCore.Components.Razor; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests -{ - // Serializes single IR nodes (shallow). - public class IntermediateNodeWriter : - IntermediateNodeVisitor, - IExtensionIntermediateNodeVisitor, - IExtensionIntermediateNodeVisitor, - IExtensionIntermediateNodeVisitor, - IExtensionIntermediateNodeVisitor, - IExtensionIntermediateNodeVisitor, - IExtensionIntermediateNodeVisitor, - IExtensionIntermediateNodeVisitor, - IExtensionIntermediateNodeVisitor, - IExtensionIntermediateNodeVisitor - { - private readonly TextWriter _writer; - - public IntermediateNodeWriter(TextWriter writer) - { - _writer = writer; - } - - public int Depth { get; set; } - - public override void VisitDefault(IntermediateNode node) - { - WriteBasicNode(node); - } - - public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node) - { - WriteContentNode(node, string.Join(" ", node.Modifiers), node.ClassName, node.BaseType, string.Join(", ", node.Interfaces ?? new List())); - } - - public override void VisitCSharpExpressionAttributeValue(CSharpExpressionAttributeValueIntermediateNode node) - { - WriteContentNode(node, node.Prefix); - } - - public override void VisitCSharpCodeAttributeValue(CSharpCodeAttributeValueIntermediateNode node) - { - WriteContentNode(node, node.Prefix); - } - - public override void VisitToken(IntermediateToken node) - { - WriteContentNode(node, node.Kind.ToString(), node.Content); - } - - public override void VisitMalformedDirective(MalformedDirectiveIntermediateNode node) - { - WriteContentNode(node, node.DirectiveName); - } - - public override void VisitDirective(DirectiveIntermediateNode node) - { - WriteContentNode(node, node.DirectiveName); - } - - public override void VisitDirectiveToken(DirectiveTokenIntermediateNode node) - { - WriteContentNode(node, node.Content); - } - - public override void VisitFieldDeclaration(FieldDeclarationIntermediateNode node) - { - WriteContentNode(node, string.Join(" ", node.Modifiers), node.FieldType, node.FieldName); - } - - public override void VisitHtmlAttribute(HtmlAttributeIntermediateNode node) - { - WriteContentNode(node, node.Prefix, node.Suffix); - } - - public override void VisitHtmlAttributeValue(HtmlAttributeValueIntermediateNode node) - { - WriteContentNode(node, node.Prefix); - } - - public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node) - { - WriteContentNode(node, node.Content); - } - - public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node) - { - WriteContentNode(node, string.Join(" ", node.Modifiers), node.ReturnType, node.MethodName); - } - - public override void VisitUsingDirective(UsingDirectiveIntermediateNode node) - { - WriteContentNode(node, node.Content); - } - - public override void VisitTagHelper(TagHelperIntermediateNode node) - { - WriteContentNode(node, node.TagName, string.Format("{0}.{1}", nameof(TagMode), node.TagMode)); - } - - public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node) - { - WriteContentNode(node, node.AttributeName, node.BoundAttribute.DisplayName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure)); - } - - public override void VisitTagHelperHtmlAttribute(TagHelperHtmlAttributeIntermediateNode node) - { - WriteContentNode(node, node.AttributeName, string.Format("HtmlAttributeValueStyle.{0}", node.AttributeStructure)); - } - - public override void VisitExtension(ExtensionIntermediateNode node) - { - // This will be called for nodes that are internal implementation details of Razor, - // like the design time directive nodes. - if (node.GetType().Assembly == typeof(RazorCodeDocument).Assembly) - { - WriteBasicNode(node); - } - else - { - throw new InvalidOperationException("Unknown node type: " + node.GetType()); - } - } - - protected void WriteBasicNode(IntermediateNode node) - { - WriteIndent(); - WriteName(node); - WriteSeparator(); - WriteSourceRange(node); - } - - protected void WriteContentNode(IntermediateNode node, params string[] content) - { - WriteIndent(); - WriteName(node); - WriteSeparator(); - WriteSourceRange(node); - - for (var i = 0; i < content.Length; i++) - { - WriteSeparator(); - WriteContent(content[i]); - } - } - - protected void WriteIndent() - { - for (var i = 0; i < Depth; i++) - { - for (var j = 0; j < 4; j++) - { - _writer.Write(' '); - } - } - } - - protected void WriteSeparator() - { - _writer.Write(" - "); - } - - protected void WriteNewLine() - { - _writer.WriteLine(); - } - - protected void WriteName(IntermediateNode node) - { - var typeName = node.GetType().Name; - if (typeName.EndsWith("IntermediateNode")) - { - _writer.Write(typeName.Substring(0, typeName.Length - "IntermediateNode".Length)); - } - else - { - _writer.Write(typeName); - } - } - - protected void WriteSourceRange(IntermediateNode node) - { - if (node.Source != null) - { - WriteSourceRange(node.Source.Value); - } - } - - protected void WriteSourceRange(SourceSpan sourceRange) - { - _writer.Write("("); - _writer.Write(sourceRange.AbsoluteIndex); - _writer.Write(":"); - _writer.Write(sourceRange.LineIndex); - _writer.Write(","); - _writer.Write(sourceRange.CharacterIndex); - _writer.Write(" ["); - _writer.Write(sourceRange.Length); - _writer.Write("] "); - - if (sourceRange.FilePath != null) - { - var fileName = sourceRange.FilePath.Substring(sourceRange.FilePath.LastIndexOf('/') + 1); - _writer.Write(fileName); - } - - _writer.Write(")"); - } - - protected void WriteDiagnostics(IntermediateNode node) - { - if (node.HasDiagnostics) - { - _writer.Write("| "); - for (var i = 0; i < node.Diagnostics.Count; i++) - { - var diagnostic = node.Diagnostics[i]; - _writer.Write("{"); - WriteSourceRange(diagnostic.Span); - _writer.Write(": "); - _writer.Write(diagnostic.Severity); - _writer.Write(" "); - _writer.Write(diagnostic.Id); - _writer.Write(": "); - - // Purposefully not writing out the entire message to ensure readable IR and because messages - // can span multiple lines. Not using string.GetHashCode because we can't have any collisions. - using (var md5 = MD5.Create()) - { - var diagnosticMessage = diagnostic.GetMessage(); - var messageBytes = Encoding.UTF8.GetBytes(diagnosticMessage); - var messageHash = md5.ComputeHash(messageBytes); - var stringHashBuilder = new StringBuilder(); - - for (var j = 0; j < messageHash.Length; j++) - { - stringHashBuilder.Append(messageHash[j].ToString("x2")); - } - - var stringHash = stringHashBuilder.ToString(); - _writer.Write(stringHash); - } - _writer.Write("} "); - } - } - } - - protected void WriteContent(string content) - { - if (content == null) - { - return; - } - - // We explicitly escape newlines in node content so that the IR can be compared line-by-line. The escaped - // newline cannot be platform specific so we need to drop the windows \r. - // Also, escape our separator so we can search for ` - `to find delimiters. - _writer.Write(content.Replace("\r", string.Empty).Replace("\n", "\\n").Replace(" - ", "\\-")); - } - - void IExtensionIntermediateNodeVisitor.VisitExtension(HtmlElementIntermediateNode node) - { - WriteContentNode(node, node.TagName); - } - - void IExtensionIntermediateNodeVisitor.VisitExtension(HtmlBlockIntermediateNode node) - { - WriteContentNode(node, node.Content); - } - - void IExtensionIntermediateNodeVisitor.VisitExtension(ComponentExtensionNode node) - { - WriteContentNode(node, node.TagName, node.TypeName); - } - - void IExtensionIntermediateNodeVisitor.VisitExtension(ComponentAttributeExtensionNode node) - { - WriteContentNode(node, node.AttributeName, node.PropertyName); - } - - void IExtensionIntermediateNodeVisitor.VisitExtension(ComponentChildContentIntermediateNode node) - { - WriteContentNode(node, node.AttributeName); - } - - void IExtensionIntermediateNodeVisitor.VisitExtension(ComponentTypeArgumentExtensionNode node) - { - WriteContentNode(node, node.TypeParameterName); - } - - void IExtensionIntermediateNodeVisitor.VisitExtension(ComponentTypeInferenceMethodIntermediateNode node) - { - WriteContentNode(node, node.FullTypeName, node.MethodName); - } - - void IExtensionIntermediateNodeVisitor.VisitExtension(RouteAttributeExtensionNode node) - { - WriteContentNode(node, node.Template); - } - - void IExtensionIntermediateNodeVisitor.VisitExtension(RefExtensionNode node) - { - WriteContentNode(node, node.IdentifierToken.Content, node.IsComponentCapture ? node.ComponentCaptureTypeName : "Element"); - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/RazorDiagnosticSerializer.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/RazorDiagnosticSerializer.cs deleted file mode 100644 index aa5586e2bf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/RazorDiagnosticSerializer.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Razor.Language -{ - public class RazorDiagnosticSerializer - { - public static string Serialize(RazorDiagnostic diagnostic) - { - return diagnostic.ToString(); - } - } -} \ No newline at end of file diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/SourceMappingsSerializer.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/SourceMappingsSerializer.cs deleted file mode 100644 index b5b44afa12..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/SourceMappingsSerializer.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Text; - -namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests -{ - public static class SourceMappingsSerializer - { - public static string Serialize(RazorCSharpDocument csharpDocument, RazorSourceDocument sourceDocument) - { - var builder = new StringBuilder(); - var charBuffer = new char[sourceDocument.Length]; - sourceDocument.CopyTo(0, charBuffer, 0, sourceDocument.Length); - var sourceContent = new string(charBuffer); - - for (var i = 0; i < csharpDocument.SourceMappings.Count; i++) - { - var sourceMapping = csharpDocument.SourceMappings[i]; - - builder.Append("Source Location: "); - AppendMappingLocation(builder, sourceMapping.OriginalSpan, sourceContent); - - builder.Append("Generated Location: "); - AppendMappingLocation(builder, sourceMapping.GeneratedSpan, csharpDocument.GeneratedCode); - - builder.AppendLine(); - } - - return builder.ToString(); - } - - private static void AppendMappingLocation(StringBuilder builder, SourceSpan location, string content) - { - builder - .AppendLine(location.ToString()) - .Append("|"); - - for (var i = 0; i < location.Length; i++) - { - builder.Append(content[location.AbsoluteIndex + i]); - } - - builder.AppendLine("|"); - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/VirtualProjectItem.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/VirtualProjectItem.cs index cf00b888a0..68c135d715 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/VirtualProjectItem.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/VirtualProjectItem.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; @@ -9,19 +9,30 @@ namespace Microsoft.AspNetCore.Razor.Language { private readonly byte[] _content; - public VirtualProjectItem(string basePath, string filePath, string physicalPath, string relativePhysicalPath, byte[] content) + public VirtualProjectItem( + string basePath, + string filePath, + string physicalPath, + string relativePhysicalPath, + string fileKind, + byte[] content) { BasePath = basePath; FilePath = filePath; PhysicalPath = physicalPath; RelativePhysicalPath = relativePhysicalPath; _content = content; + + // Base class will detect based on file-extension. + FileKind = fileKind ?? base.FileKind; } public override string BasePath { get; } public override string RelativePhysicalPath { get; } + public override string FileKind { get; } + public override string FilePath { get; } public override string PhysicalPath { get; } diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorBaselineIntegrationTestBase.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorBaselineIntegrationTestBase.cs deleted file mode 100644 index 1c3e5d443c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorBaselineIntegrationTestBase.cs +++ /dev/null @@ -1,211 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Threading; -using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Language.IntegrationTests; -using Xunit; -using Xunit.Sdk; - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - [InitializeTestFile] - public abstract class RazorBaselineIntegrationTestBase : RazorIntegrationTestBase - { - private static readonly AsyncLocal _directoryPath = new AsyncLocal(); - - protected RazorBaselineIntegrationTestBase(bool? generateBaselines = null) - { - TestProjectRoot = TestProject.GetProjectDirectory(GetType()); - - if (generateBaselines.HasValue) - { - GenerateBaselines = generateBaselines.Value; - } - } - - // Used by the test framework to set the directory for test files. - public static string DirectoryPath - { - get { return _directoryPath.Value; } - set { _directoryPath.Value = value; } - } - -#if GENERATE_BASELINES - protected bool GenerateBaselines { get; } = true; -#else - protected bool GenerateBaselines { get; } = false; -#endif - - protected string TestProjectRoot { get; } - - // For consistent line endings because the character counts are going to be recorded in files. - internal override string LineEnding => "\r\n"; - - internal override bool NormalizeSourceLineEndings => true; - - internal override string PathSeparator => "\\"; - - // Force consistent paths since they are going to be recorded in files. - internal override string WorkingDirectory => ArbitraryWindowsPath; - - [Fact] - public void GenerateBaselinesMustBeFalse() - { - Assert.False(GenerateBaselines, "GenerateBaselines should be set back to false before you check in!"); - } - - protected void AssertDocumentNodeMatchesBaseline(RazorCodeDocument codeDocument) - { - var document = codeDocument.GetDocumentIntermediateNode(); - var baselineFilePath = GetBaselineFilePath(codeDocument, ".ir.txt"); - - if (GenerateBaselines) - { - var baselineFullPath = Path.Combine(TestProjectRoot, baselineFilePath); - Directory.CreateDirectory(Path.GetDirectoryName(baselineFullPath)); - WriteBaseline(IntermediateNodeSerializer.Serialize(document), baselineFullPath); - - return; - } - - var irFile = TestFile.Create(baselineFilePath, GetType().Assembly); - if (!irFile.Exists()) - { - throw new XunitException($"The resource {baselineFilePath} was not found."); - } - - // Normalize newlines by splitting into an array. - var baseline = irFile.ReadAllText().Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); - IntermediateNodeVerifier.Verify(document, baseline); - } - - protected void AssertCSharpDocumentMatchesBaseline(RazorCodeDocument codeDocument) - { - var document = codeDocument.GetCSharpDocument(); - - // Normalize newlines to match those in the baseline. - var actualCode = document.GeneratedCode.Replace("\r", "").Replace("\n", "\r\n"); - - var baselineFilePath = GetBaselineFilePath(codeDocument, ".codegen.cs"); - var baselineDiagnosticsFilePath = GetBaselineFilePath(codeDocument, ".diagnostics.txt"); - var baselineMappingsFilePath = GetBaselineFilePath(codeDocument, ".mappings.txt"); - - var serializedMappings = SourceMappingsSerializer.Serialize(document, codeDocument.Source); - - if (GenerateBaselines) - { - var baselineFullPath = Path.Combine(TestProjectRoot, baselineFilePath); - Directory.CreateDirectory(Path.GetDirectoryName(baselineFullPath)); - WriteBaseline(actualCode, baselineFullPath); - - var baselineDiagnosticsFullPath = Path.Combine(TestProjectRoot, baselineDiagnosticsFilePath); - var lines = document.Diagnostics.Select(RazorDiagnosticSerializer.Serialize).ToArray(); - if (lines.Any()) - { - WriteBaseline(lines, baselineDiagnosticsFullPath); - } - else if (File.Exists(baselineDiagnosticsFullPath)) - { - File.Delete(baselineDiagnosticsFullPath); - } - - var baselineMappingsFullPath = Path.Combine(TestProjectRoot, baselineMappingsFilePath); - var text = SourceMappingsSerializer.Serialize(document, codeDocument.Source); - if (!string.IsNullOrEmpty(text)) - { - WriteBaseline(text, baselineMappingsFullPath); - } - else if (File.Exists(baselineMappingsFullPath)) - { - File.Delete(baselineMappingsFullPath); - } - - return; - } - - var codegenFile = TestFile.Create(baselineFilePath, GetType().Assembly); - if (!codegenFile.Exists()) - { - throw new XunitException($"The resource {baselineFilePath} was not found."); - } - - var baseline = codegenFile.ReadAllText(); - Assert.Equal(baseline, actualCode); - - var baselineDiagnostics = string.Empty; - var diagnosticsFile = TestFile.Create(baselineDiagnosticsFilePath, GetType().Assembly); - if (diagnosticsFile.Exists()) - { - baselineDiagnostics = diagnosticsFile.ReadAllText(); - } - - var actualDiagnostics = string.Concat(document.Diagnostics.Select(d => RazorDiagnosticSerializer.Serialize(d) + "\r\n")); - Assert.Equal(baselineDiagnostics, actualDiagnostics); - - var baselineMappings = string.Empty; - var mappingsFile = TestFile.Create(baselineMappingsFilePath, GetType().Assembly); - if (mappingsFile.Exists()) - { - baselineMappings = mappingsFile.ReadAllText(); - } - - var actualMappings = SourceMappingsSerializer.Serialize(document, codeDocument.Source); - actualMappings = actualMappings.Replace("\r", "").Replace("\n", "\r\n"); - Assert.Equal(baselineMappings, actualMappings); - } - - private string GetBaselineFilePath(RazorCodeDocument codeDocument, string extension) - { - if (codeDocument == null) - { - throw new ArgumentNullException(nameof(codeDocument)); - } - - if (extension == null) - { - throw new ArgumentNullException(nameof(extension)); - } - - var lastSlash = codeDocument.Source.FilePath.LastIndexOfAny(new []{ '/', '\\' }); - var fileName = lastSlash == -1 ? null : codeDocument.Source.FilePath.Substring(lastSlash + 1); - if (string.IsNullOrEmpty(fileName)) - { - var message = "Integration tests require a filename"; - throw new InvalidOperationException(message); - } - - if (DirectoryPath == null) - { - var message = $"{nameof(AssertDocumentNodeMatchesBaseline)} should only be called from an integration test.."; - throw new InvalidOperationException(message); - } - - return Path.Combine(DirectoryPath, Path.ChangeExtension(fileName, extension)); - } - - private static void WriteBaseline(string text, string filePath) - { - var lines = text.Replace("\r", "").Replace("\n", "\r\n"); - File.WriteAllText(filePath, text); - } - - private static void WriteBaseline(string[] lines, string filePath) - { - using (var writer = new StreamWriter(File.Open(filePath, FileMode.Create))) - { - // Force windows-style line endings so that we're consistent. This isn't - // required for correctness, but will prevent churn when developing on OSX. - writer.NewLine = "\r\n"; - - for (var i = 0; i < lines.Length; i++) - { - writer.WriteLine(lines[i]); - } - } - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs index 09fdd8a5cd..04c6ebdaeb 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs @@ -8,9 +8,8 @@ using System.Linq; using System.Reflection; using System.Runtime.InteropServices; using System.Text; +using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Components.Razor; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; @@ -20,12 +19,15 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Razor; using Xunit; +using Xunit.Abstractions; using Xunit.Sdk; namespace Microsoft.AspNetCore.Components.Build.Test { public class RazorIntegrationTestBase { + private static readonly AsyncLocal _output = new AsyncLocal(); + internal const string ArbitraryWindowsPath = "x:\\dir\\subdir\\Test"; internal const string ArbitraryMacLinuxPath = "/dir/subdir/Test"; @@ -59,17 +61,23 @@ namespace Microsoft.AspNetCore.Components.Build.Test CSharpParseOptions = new CSharpParseOptions(LanguageVersion.CSharp7_3); } - public RazorIntegrationTestBase() + public RazorIntegrationTestBase(ITestOutputHelper output) { + _output.Value = output; + AdditionalSyntaxTrees = new List(); AdditionalRazorItems = new List(); - - Configuration = BlazorExtensionInitializer.DefaultConfiguration; + Configuration = RazorConfiguration.Create(RazorLanguageVersion.Latest, "MVC-3.0", Array.Empty()); + FileKind = FileKinds.Component; // Treat input files as components by default. FileSystem = new VirtualRazorProjectFileSystem(); PathSeparator = Path.DirectorySeparatorChar.ToString(); WorkingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ArbitraryWindowsPath : ArbitraryMacLinuxPath; + // Many of the rendering tests include line endings in the output. + LineEnding = "\n"; + NormalizeSourceLineEndings = true; + DefaultBaseNamespace = "Test"; // Matches the default working directory DefaultFileName = "TestComponent.cshtml"; } @@ -85,6 +93,8 @@ namespace Microsoft.AspNetCore.Components.Build.Test internal virtual string DefaultFileName { get; } internal virtual bool DesignTime { get; } + + internal virtual string FileKind { get; } internal virtual VirtualRazorProjectFileSystem FileSystem { get; } @@ -97,14 +107,15 @@ namespace Microsoft.AspNetCore.Components.Build.Test internal virtual string PathSeparator { get; } internal virtual bool NormalizeSourceLineEndings { get; } - + internal virtual bool UseTwoPhaseCompilation { get; } internal virtual string WorkingDirectory { get; } - internal RazorProjectEngine CreateProjectEngine(RazorConfiguration configuration, MetadataReference[] references) + // Intentionally private, we don't want tests messing with this because it's fragile. + private RazorProjectEngine CreateProjectEngine(MetadataReference[] references) { - return RazorProjectEngine.Create(configuration, FileSystem, b => + return RazorProjectEngine.Create(Configuration, FileSystem, b => { // Turn off checksums, we're testing code generation. b.Features.Add(new SuppressChecksum()); @@ -114,7 +125,11 @@ namespace Microsoft.AspNetCore.Components.Build.Test b.Phases.Insert(0, new ForceLineEndingPhase(LineEnding)); } - BlazorExtensionInitializer.Register(b); + // Including MVC here so that we can find any issues that arise from mixed MVC + Components. + Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions.Register(b); + + // Features that use Roslyn are mandatory for components + Microsoft.CodeAnalysis.Razor.CompilerFeatures.Register(b); b.Features.Add(new CompilationTagHelperFeature()); b.Features.Add(new DefaultMetadataReferenceFeature() @@ -141,10 +156,11 @@ namespace Microsoft.AspNetCore.Components.Build.Test } return new VirtualProjectItem( - WorkingDirectory, - filePath, + WorkingDirectory, + filePath, fullPath, cshtmlRelativePath, + FileKind, Encoding.UTF8.GetBytes(cshtmlContent.TrimStart())); } @@ -159,13 +175,13 @@ namespace Microsoft.AspNetCore.Components.Build.Test { // The first phase won't include any metadata references for component discovery. This mirrors // what the build does. - var projectEngine = CreateProjectEngine(BlazorExtensionInitializer.DeclarationConfiguration, Array.Empty()); + var projectEngine = CreateProjectEngine(Array.Empty()); RazorCodeDocument codeDocument; foreach (var item in AdditionalRazorItems) { // Result of generating declarations - codeDocument = projectEngine.Process(item); + codeDocument = projectEngine.ProcessDeclarationOnly(item); Assert.Empty(codeDocument.GetCSharpDocument().Diagnostics); var syntaxTree = Parse(codeDocument.GetCSharpDocument().GeneratedCode, path: item.FilePath); @@ -174,7 +190,7 @@ namespace Microsoft.AspNetCore.Components.Build.Test // Result of generating declarations var projectItem = CreateProjectItem(cshtmlRelativePath, cshtmlContent); - codeDocument = projectEngine.Process(projectItem); + codeDocument = projectEngine.ProcessDeclarationOnly(projectItem); var declaration = new CompileToCSharpResult { BaseCompilation = BaseCompilation.AddSyntaxTrees(AdditionalSyntaxTrees), @@ -188,13 +204,13 @@ namespace Microsoft.AspNetCore.Components.Build.Test // Add the 'temp' compilation as a metadata reference var references = BaseCompilation.References.Concat(new[] { tempAssembly.Compilation.ToMetadataReference() }).ToArray(); - projectEngine = CreateProjectEngine(BlazorExtensionInitializer.DefaultConfiguration, references); + projectEngine = CreateProjectEngine(references); // Now update the any additional files foreach (var item in AdditionalRazorItems) { // Result of generating declarations - codeDocument = projectEngine.Process(item); + codeDocument = DesignTime ? projectEngine.ProcessDesignTime(item) : projectEngine.Process(item); Assert.Empty(codeDocument.GetCSharpDocument().Diagnostics); // Replace the 'declaration' syntax tree @@ -205,6 +221,30 @@ namespace Microsoft.AspNetCore.Components.Build.Test // Result of real code generation for the document under test codeDocument = DesignTime ? projectEngine.ProcessDesignTime(projectItem) : projectEngine.Process(projectItem); + + _output.Value.WriteLine("Use this output when opening an issue"); + _output.Value.WriteLine(string.Empty); + + _output.Value.WriteLine($"## Main source file ({projectItem.FileKind}):"); + _output.Value.WriteLine("```"); + _output.Value.WriteLine(ReadProjectItem(projectItem)); + _output.Value.WriteLine("```"); + _output.Value.WriteLine(string.Empty); + + foreach (var item in AdditionalRazorItems) + { + _output.Value.WriteLine($"### Additional source file ({item.FileKind}):"); + _output.Value.WriteLine("```"); + _output.Value.WriteLine(ReadProjectItem(item)); + _output.Value.WriteLine("```"); + _output.Value.WriteLine(string.Empty); + } + + _output.Value.WriteLine("## Generated C#:"); + _output.Value.WriteLine("```C#"); + _output.Value.WriteLine(codeDocument.GetCSharpDocument().GeneratedCode); + _output.Value.WriteLine("```"); + return new CompileToCSharpResult { BaseCompilation = BaseCompilation.AddSyntaxTrees(AdditionalSyntaxTrees), @@ -217,10 +257,26 @@ namespace Microsoft.AspNetCore.Components.Build.Test { // For single phase compilation tests just use the base compilation's references. // This will include the built-in Blazor components. - var projectEngine = CreateProjectEngine(Configuration, BaseCompilation.References.ToArray()); + var projectEngine = CreateProjectEngine(BaseCompilation.References.ToArray()); var projectItem = CreateProjectItem(cshtmlRelativePath, cshtmlContent); var codeDocument = DesignTime ? projectEngine.ProcessDesignTime(projectItem) : projectEngine.Process(projectItem); + + // Log the generated code for test results. + _output.Value.WriteLine("Use this output when opening an issue"); + _output.Value.WriteLine(string.Empty); + + _output.Value.WriteLine($"## Main source file ({projectItem.FileKind}):"); + _output.Value.WriteLine("```"); + _output.Value.WriteLine(ReadProjectItem(projectItem)); + _output.Value.WriteLine("```"); + _output.Value.WriteLine(string.Empty); + + _output.Value.WriteLine("## Generated C#:"); + _output.Value.WriteLine("```"); + _output.Value.WriteLine(codeDocument.GetCSharpDocument().GeneratedCode); + _output.Value.WriteLine("```"); + return new CompileToCSharpResult { BaseCompilation = BaseCompilation.AddSyntaxTrees(AdditionalSyntaxTrees), @@ -343,6 +399,14 @@ namespace Microsoft.AspNetCore.Components.Build.Test Assert.Equal(expected, generated.Code.Trim(), ignoreLineEndingDifferences: true); } + private static string ReadProjectItem(RazorProjectItem item) + { + using (var reader = new StreamReader(item.Read())) + { + return reader.ReadToEnd(); + } + } + protected class CompileToCSharpResult { // A compilation that can be used *with* this code to compile an assembly diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs index 34f957229e..7444841b96 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; +using Xunit.Abstractions; namespace Microsoft.AspNetCore.Components.Build.Test { @@ -14,6 +14,11 @@ namespace Microsoft.AspNetCore.Components.Build.Test // Includes running the component code to verify the output. public class RenderingRazorIntegrationTest : RazorIntegrationTestBase { + public RenderingRazorIntegrationTest(ITestOutputHelper output) + : base(output) + { + } + [Fact] public void SupportsPlainText() { @@ -83,7 +88,7 @@ namespace Microsoft.AspNetCore.Components.Build.Test frame => AssertFrame.Text(frame, "there", 2)); } - [Fact(Skip = "Temporarily disable compiling markup frames in 0.5.1")] + [Fact] public void SupportsElementsAsStaticBlock() { // Arrange/Act @@ -144,28 +149,28 @@ namespace Microsoft.AspNetCore.Components.Build.Test frame => AssertFrame.Attribute(frame, "myattr", "val", 2)); } - [Fact(Skip = "Temporarily disable compiling markup frames in 0.5.1")] + [Fact] public void SupportsSelfClosingElementsAsStaticBlock() { // Arrange/Act var component = CompileToComponent("Some text so elem isn't at position 0 "); // Assert - Assert.Collection(GetRenderTree(component), - frame => AssertFrame.Text(frame, "Some text so elem isn't at position 0 ", 0), - frame => AssertFrame.Markup(frame, "", 1)); + Assert.Collection( + GetRenderTree(component), + frame => AssertFrame.Markup(frame, "Some text so elem isn't at position 0 ", 0)); } - [Fact(Skip = "Temporarily disable compiling markup frames in 0.5.1")] + [Fact] public void SupportsVoidHtmlElements() { // Arrange/Act var component = CompileToComponent("Some text so elem isn't at position 0 "); // Assert - Assert.Collection(GetRenderTree(component), - frame => AssertFrame.Text(frame, "Some text so elem isn't at position 0 ", 0), - frame => AssertFrame.Markup(frame, "", 1)); + Assert.Collection( + GetRenderTree(component), + frame => AssertFrame.Markup(frame, "Some text so elem isn't at position 0 ", 0)); } [Fact] diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeCodeGenerationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeCodeGenerationTest.cs deleted file mode 100644 index 9cb34bb48d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeCodeGenerationTest.cs +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - public class RuntimeCodeGenerationTest : CodeGenerationTestBase - { - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TemplateRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TemplateRazorIntegrationTest.cs deleted file mode 100644 index 3ab6ea1bed..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TemplateRazorIntegrationTest.cs +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Xunit; - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - public class TemplateRazorIntegrationTest : RazorIntegrationTestBase - { - // Razor doesn't parse this as a template, we don't need much special handling for - // it because it will just be invalid in general. - [Fact] - public void Template_ImplicitExpressionInMarkupAttribute_CreatesDiagnostic() - { - // Arrange - - // Act - var generated = CompileToCSharp(@"
    "" />"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Equal("RZ1005", diagnostic.Id); - } - - [Fact] - public void Template_ExplicitExpressionInMarkupAttribute_CreatesDiagnostic() - { - // Arrange - - // Act - var generated = CompileToCSharp(@"
    )"" />"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Equal("BL9994", diagnostic.Id); - } - - // Razor doesn't parse this as a template, we don't need much special handling for - // it because it will just be invalid in general. - [Fact] - public void Template_ImplicitExpressionInComponentAttribute_CreatesDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - } -} -")); - - // Act - var generated = CompileToCSharp(@"
    "" />"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Equal("RZ1005", diagnostic.Id); - } - - [Fact] - public void Template_ExplicitExpressionInComponentAttribute_CreatesDiagnostic() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - } -} -")); - // Act - var generated = CompileToCSharp(@"
    )"" />"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Equal("BL9994", diagnostic.Id); - } - - [Fact] - public void Template_ExplicitExpressionInRef_CreatesDiagnostic() - { - // Arrange - - // Act - var generated = CompileToCSharp(@"
    )"" />"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Equal("BL9994", diagnostic.Id); - } - - - [Fact] - public void Template_ExplicitExpressionInBind_CreatesDiagnostic() - { - // Arrange - - // Act - var generated = CompileToCSharp(@")"" />"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Equal("BL9994", diagnostic.Id); - } - - [Fact] - public void Template_ExplicitExpressionInEventHandler_CreatesDiagnostic() - { - // Arrange - - // Act - var generated = CompileToCSharp(@")"" />"); - - // Assert - var diagnostic = Assert.Single(generated.Diagnostics); - Assert.Equal("BL9994", diagnostic.Id); - } - } -} \ No newline at end of file diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TypingTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TypingTest.cs deleted file mode 100644 index 72aa448d63..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TypingTest.cs +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Xunit; -using Xunit.Sdk; - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - // Similar to design time code generation tests, but goes a character at a time. - // Don't add many of these since they are slow - instead add features to existing - // tests here, and use these as smoke tests, not for detailed regression testing. - public class TypingTest : RazorIntegrationTestBase - { - internal override bool DesignTime => true; - - internal override bool UseTwoPhaseCompilation => false; - - [Fact] - public void DoSomeTyping() - { - // Arrange - AdditionalSyntaxTrees.Add(Parse(@" -using System; -using Microsoft.AspNetCore.Components; - -namespace Test -{ - public class MyComponent : ComponentBase - { - [Parameter] int Value { get; set; } - [Parameter] Action ValueChanged { get; set; } - [Parameter] string AnotherValue { get; set; } - } - - public class ModelState - { - public Action Bind(Func func) => throw null; - } -} -")); - var text = @" -@addTagHelper *, TestAssembly -
    - - x)"" /> - -
    - -@functions { - Test.ModelState ModelState { get; set; } -}"; - - for (var i = 0; i <= text.Length; i++) - { - try - { - CompileToCSharp(text.Substring(0, i)); - } - catch (Exception ex) - { - throw new XunitException($@" -Code generation failed on iteration {i} with source text: -{text.Substring(0, i)} - -Exception: -{ex} -"); - } - } - } - - [Fact] // Regression test for #1068 - public void Regression_1068() - { - // Arrange - - // Act - var generated = CompileToCSharp(@" - -@functions { - Test.ModelState ModelState { get; set; } -} -"); - - // Assert - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/WorkingDirectoryRazorIntegrationTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/WorkingDirectoryRazorIntegrationTest.cs deleted file mode 100644 index f85b50120c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/WorkingDirectoryRazorIntegrationTest.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using System.Runtime.InteropServices; -using Xunit; - -namespace Microsoft.AspNetCore.Components.Build.Test -{ - // Integration tests focused on file path handling for class/namespace names - public class WorkingDirectoryRazorIntegrationTest : RazorIntegrationTestBase - { - public WorkingDirectoryRazorIntegrationTest() - { - WorkingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ArbitraryWindowsPath : ArbitraryMacLinuxPath; - WorkingDirectory += "-Dir"; - } - - internal override string WorkingDirectory { get; } - - [Theory] - [InlineData("ItemAtRoot.cs", "Test_Dir", "ItemAtRoot")] - [InlineData("Dir1\\MyFile.cs", "Test_Dir.Dir1", "MyFile")] - [InlineData("Dir1\\Dir2\\MyFile.cs", "Test_Dir.Dir1.Dir2", "MyFile")] - public void CreatesClassWithCorrectNameAndNamespace(string relativePath, string expectedNamespace, string expectedClassName) - { - // Arrange - relativePath = relativePath.Replace('\\', Path.DirectorySeparatorChar); - - // Act - var result = CompileToAssembly(relativePath, ""); - - // Assert - Assert.Empty(result.Diagnostics); - - var type = Assert.Single(result.Assembly.GetTypes()); - Assert.Equal(expectedNamespace, type.Namespace); - Assert.Equal(expectedClassName, type.Name); - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserTestBase.cs b/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserTestBase.cs index cc13ce5b7a..2487632d09 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserTestBase.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserTestBase.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading; diff --git a/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/Tests/ComponentRenderingTest.cs b/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/Tests/ComponentRenderingTest.cs index ac9547b54e..a50ccb1748 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/Tests/ComponentRenderingTest.cs +++ b/src/Components/test/Microsoft.AspNetCore.Components.E2ETest/Tests/ComponentRenderingTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; From b1f4a7bafd805352c677c84c15eb1e96ad53d467 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Sat, 29 Dec 2018 16:08:14 -0800 Subject: [PATCH 43/80] Delete baseline files --- .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 42 ---------- .../TestComponent.ir.txt | 32 -------- .../TestComponent.mappings.txt | 25 ------ .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 42 ---------- .../TestComponent.ir.txt | 32 -------- .../TestComponent.mappings.txt | 25 ------ .../TestComponent.codegen.cs | 50 ------------ .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 49 ------------ .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 50 ------------ .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 49 ------------ .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 50 ------------ .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 40 ---------- .../TestComponent.ir.txt | 41 ---------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 40 ---------- .../TestComponent.ir.txt | 39 ---------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 40 ---------- .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 40 ---------- .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 59 -------------- .../TestComponent.ir.txt | 38 --------- .../TestComponent.mappings.txt | 25 ------ .../TestComponent.codegen.cs | 62 --------------- .../TestComponent.ir.txt | 41 ---------- .../TestComponent.mappings.txt | 25 ------ .../TestComponent.codegen.cs | 40 ---------- .../TestComponent.ir.txt | 39 ---------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 42 ---------- .../TestComponent.ir.txt | 41 ---------- .../TestComponent.mappings.txt | 28 ------- .../TestComponent.codegen.cs | 40 ---------- .../TestComponent.ir.txt | 41 ---------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 40 ---------- .../TestComponent.ir.txt | 39 ---------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 40 ---------- .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 49 ------------ .../TestComponent.ir.txt | 29 ------- .../TestComponent.mappings.txt | 15 ---- .../TestComponent.codegen.cs | 57 -------------- .../TestComponent.ir.txt | 38 --------- .../TestComponent.mappings.txt | 24 ------ .../TestComponent.codegen.cs | 56 ------------- .../TestComponent.ir.txt | 38 --------- .../TestComponent.mappings.txt | 24 ------ .../TestComponent.codegen.cs | 66 ---------------- .../TestComponent.ir.txt | 42 ---------- .../TestComponent.mappings.txt | 24 ------ .../TestComponent.codegen.cs | 60 -------------- .../TestComponent.ir.txt | 39 ---------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 54 ------------- .../TestComponent.ir.txt | 37 --------- .../TestComponent.mappings.txt | 20 ----- .../TestComponent.codegen.cs | 60 -------------- .../TestComponent.ir.txt | 38 --------- .../TestComponent.mappings.txt | 15 ---- .../TestComponent.codegen.cs | 56 ------------- .../TestComponent.ir.txt | 32 -------- .../TestComponent.mappings.txt | 20 ----- .../TestComponent.codegen.cs | 59 -------------- .../TestComponent.ir.txt | 33 -------- .../TestComponent.mappings.txt | 15 ---- .../TestComponent.codegen.cs | 52 ------------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 78 ------------------- .../TestComponent.ir.txt | 44 ----------- .../TestComponent.mappings.txt | 20 ----- .../TestComponent.codegen.cs | 69 ---------------- .../TestComponent.ir.txt | 42 ---------- .../TestComponent.mappings.txt | 30 ------- .../TestComponent.codegen.cs | 75 ------------------ .../TestComponent.ir.txt | 44 ----------- .../TestComponent.mappings.txt | 25 ------ .../TestComponent.codegen.cs | 35 --------- .../TestComponent.ir.txt | 24 ------ .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 36 --------- .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 35 --------- .../TestComponent.ir.txt | 28 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 35 --------- .../TestComponent.ir.txt | 27 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 51 ------------ .../TestComponent.ir.txt | 31 -------- .../TestComponent.mappings.txt | 25 ------ .../TestComponent.codegen.cs | 40 ---------- .../TestComponent.ir.txt | 27 ------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 42 ---------- .../TestComponent.ir.txt | 27 ------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 41 ---------- .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 41 ---------- .../TestComponent.ir.txt | 38 --------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 41 ---------- .../TestComponent.ir.txt | 38 --------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 51 ------------ .../TestComponent.ir.txt | 31 -------- .../TestComponent.mappings.txt | 25 ------ .../TestComponent.codegen.cs | 43 ---------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 45 ----------- .../TestComponent.ir.txt | 28 ------- .../TestComponent.mappings.txt | 15 ---- .../TestComponent.codegen.cs | 57 -------------- .../TestComponent.ir.txt | 33 -------- .../TestComponent.mappings.txt | 20 ----- .../TestComponent.codegen.cs | 48 ------------ .../TestComponent.ir.txt | 33 -------- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 42 ---------- .../TestComponent.ir.txt | 29 ------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 66 ---------------- .../TestComponent.ir.txt | 46 ----------- .../TestComponent.mappings.txt | 49 ------------ .../TestComponent.codegen.cs | 28 ------- .../TestComponent.ir.txt | 25 ------ .../TestComponent.codegen.cs | 49 ------------ .../Component_WithRef/TestComponent.ir.txt | 37 --------- .../TestComponent.mappings.txt | 21 ----- .../TestComponent.codegen.cs | 48 ------------ .../TestComponent.ir.txt | 42 ---------- .../TestComponent.mappings.txt | 21 ----- .../Element_WithRef/TestComponent.codegen.cs | 40 ---------- .../Element_WithRef/TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 16 ---- .../TestComponent.codegen.cs | 29 ------- .../TestComponent.ir.txt | 28 ------- .../TestComponent.codegen.cs | 36 --------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.mappings.txt | 16 ---- .../TestComponent.codegen.cs | 36 --------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.mappings.txt | 16 ---- .../TestComponent.codegen.cs | 29 ------- .../TestComponent.ir.txt | 26 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 36 --------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.mappings.txt | 16 ---- .../TestComponent.codegen.cs | 29 ------- .../TestComponent.ir.txt | 26 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 36 --------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.mappings.txt | 16 ---- .../TestComponent.codegen.cs | 29 ------- .../TestComponent.ir.txt | 26 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 29 ------- .../TestComponent.ir.txt | 26 ------- .../TestComponent.codegen.cs | 61 --------------- .../TestComponent.ir.txt | 35 --------- .../TestComponent.mappings.txt | 31 -------- .../TestComponent.codegen.cs | 67 ---------------- .../TestComponent.ir.txt | 36 --------- .../TestComponent.mappings.txt | 26 ------- .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 27 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 35 --------- .../TestComponent.ir.txt | 29 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 32 -------- .../TestComponent.ir.txt | 25 ------ .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 43 ---------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 64 --------------- .../TestComponent.ir.txt | 43 ---------- .../TestComponent.mappings.txt | 30 ------- .../TestComponent.codegen.cs | 64 --------------- .../TestComponent.ir.txt | 35 --------- .../TestComponent.mappings.txt | 39 ---------- .../TestComponent.codegen.cs | 72 ----------------- .../TestComponent.ir.txt | 45 ----------- .../TestComponent.mappings.txt | 44 ----------- .../TestComponent.codegen.cs | 59 -------------- .../TestComponent.ir.txt | 37 --------- .../TestComponent.mappings.txt | 25 ------ .../TestComponent.codegen.cs | 51 ------------ .../TestComponent.ir.txt | 31 -------- .../TestComponent.mappings.txt | 34 -------- .../TestComponent.codegen.cs | 55 ------------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.mappings.txt | 34 -------- .../TestComponent.codegen.cs | 51 ------------ .../TestComponent.ir.txt | 31 -------- .../TestComponent.mappings.txt | 34 -------- .../TestComponent.codegen.cs | 54 ------------- .../TestComponent.ir.txt | 37 --------- .../TestComponent.mappings.txt | 20 ----- .../TestComponent.codegen.cs | 41 ---------- .../TestComponent.ir.txt | 31 -------- .../TestComponent.mappings.txt | 19 ----- .../Regression_597/TestComponent.codegen.cs | 49 ------------ .../Regression_597/TestComponent.ir.txt | 38 --------- .../Regression_597/TestComponent.mappings.txt | 19 ----- .../Regression_609/TestComponent.codegen.cs | 58 -------------- .../Regression_609/TestComponent.ir.txt | 46 ----------- .../Regression_609/TestComponent.mappings.txt | 26 ------- .../Regression_772/TestComponent.codegen.cs | 41 ---------- .../TestComponent.diagnostics.txt | 2 - .../Regression_772/TestComponent.ir.txt | 36 --------- .../Regression_772/TestComponent.mappings.txt | 10 --- .../Regression_773/TestComponent.codegen.cs | 41 ---------- .../Regression_773/TestComponent.ir.txt | 38 --------- .../Regression_773/TestComponent.mappings.txt | 10 --- .../Regression_784/TestComponent.codegen.cs | 44 ----------- .../Regression_784/TestComponent.ir.txt | 39 ---------- .../Regression_784/TestComponent.mappings.txt | 27 ------- .../TestComponent.codegen.cs | 28 ------- .../TestComponent.ir.txt | 36 --------- .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 29 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 35 --------- .../TestComponent.ir.txt | 31 -------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 29 ------- .../TestComponent.mappings.txt | 5 -- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 17 ---- .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 19 ----- .../TestComponent.mappings.txt | 15 ---- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 17 ---- .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 19 ----- .../TestComponent.mappings.txt | 15 ---- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 22 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 22 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 22 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 22 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 22 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 32 -------- .../TestComponent.ir.txt | 27 ------- .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 32 -------- .../TestComponent.ir.txt | 25 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 22 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 22 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 43 ---------- .../TestComponent.ir.txt | 26 ------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 47 ----------- .../TestComponent.ir.txt | 29 ------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 32 -------- .../TestComponent.ir.txt | 25 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 34 -------- .../TestComponent.ir.txt | 27 ------- .../TestComponent.mappings.txt | 13 ---- .../TestComponent.codegen.cs | 32 -------- .../TestComponent.ir.txt | 27 ------- .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 32 -------- .../TestComponent.ir.txt | 25 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 22 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 17 ---- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 24 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 24 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 43 ---------- .../TestComponent.ir.txt | 28 ------- .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 42 ---------- .../TestComponent.ir.txt | 25 ------ .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 32 -------- .../TestComponent.ir.txt | 25 ------ .../TestComponent.codegen.cs | 43 ---------- .../TestComponent.ir.txt | 26 ------- .../TestComponent.codegen.cs | 25 ------ .../TestComponent.ir.txt | 20 ----- .../TestComponent.codegen.cs | 36 --------- .../TestComponent.ir.txt | 21 ----- .../TestComponent.codegen.cs | 35 --------- .../TestComponent.ir.txt | 18 ----- .../TestComponent.codegen.cs | 51 ------------ .../TestComponent.ir.txt | 32 -------- .../TestComponent.codegen.cs | 36 --------- .../TestComponent.ir.txt | 30 ------- .../TestComponent.codegen.cs | 48 ------------ .../TestComponent.ir.txt | 32 -------- .../TestComponent.codegen.cs | 23 ------ .../TestComponent.ir.txt | 12 --- .../TestComponent.codegen.cs | 29 ------- .../TestComponent.ir.txt | 19 ----- .../TestComponent.codegen.cs | 27 ------- .../TestComponent.ir.txt | 14 ---- .../TestComponent.codegen.cs | 27 ------- .../TestComponent.ir.txt | 15 ---- .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 17 ---- .../TestComponent.mappings.txt | 15 ---- .../TestComponent.codegen.cs | 27 ------- .../TestComponent.ir.txt | 15 ---- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 15 ---- .../TestComponent.codegen.cs | 32 -------- .../TestComponent.ir.txt | 24 ------ .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 26 ------- .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 26 ------- .../TestComponent.codegen.cs | 33 -------- .../TestComponent.ir.txt | 17 ---- .../TestComponent.mappings.txt | 15 ---- .../TestComponent.codegen.cs | 25 ------ .../TestComponent.ir.txt | 18 ----- .../TestComponent.codegen.cs | 25 ------ .../TestComponent.ir.txt | 14 ---- .../TestComponent.codegen.cs | 27 ------- .../TestComponent.ir.txt | 21 ----- .../TestComponent.codegen.cs | 30 ------- .../TestComponent.ir.txt | 19 ----- .../TestComponent.mappings.txt | 9 --- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 15 ---- .../TestComponent.codegen.cs | 48 ------------ .../TestComponent.ir.txt | 29 ------- .../TestComponent.mappings.txt | 29 ------- .../TestComponent.codegen.cs | 22 ------ .../TestComponent.ir.txt | 12 --- .../TestComponent.codegen.cs | 40 ---------- .../Component_WithRef/TestComponent.ir.txt | 21 ----- .../TestComponent.mappings.txt | 16 ---- .../TestComponent.codegen.cs | 44 ----------- .../TestComponent.ir.txt | 22 ------ .../TestComponent.mappings.txt | 16 ---- .../Element_WithRef/TestComponent.codegen.cs | 41 ---------- .../Element_WithRef/TestComponent.ir.txt | 23 ------ .../TestComponent.mappings.txt | 16 ---- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 17 ---- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 19 ----- .../TestComponent.mappings.txt | 11 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 19 ----- .../TestComponent.mappings.txt | 11 --- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 17 ---- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 19 ----- .../TestComponent.mappings.txt | 11 --- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 17 ---- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 19 ----- .../TestComponent.mappings.txt | 11 --- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 17 ---- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 17 ---- .../TestComponent.codegen.cs | 39 ---------- .../TestComponent.ir.txt | 19 ----- .../TestComponent.mappings.txt | 16 ---- .../TestComponent.codegen.cs | 50 ------------ .../TestComponent.ir.txt | 20 ----- .../TestComponent.mappings.txt | 16 ---- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 16 ---- .../TestComponent.codegen.cs | 25 ------ .../TestComponent.ir.txt | 15 ---- .../TestComponent.codegen.cs | 22 ------ .../TestComponent.ir.txt | 12 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 18 ----- .../TestComponent.codegen.cs | 42 ---------- .../TestComponent.ir.txt | 29 ------- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 48 ------------ .../TestComponent.ir.txt | 23 ------ .../TestComponent.mappings.txt | 29 ------- .../TestComponent.codegen.cs | 56 ------------- .../TestComponent.ir.txt | 31 -------- .../TestComponent.mappings.txt | 29 ------- .../TestComponent.codegen.cs | 39 ---------- .../TestComponent.ir.txt | 23 ------ .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 38 --------- .../TestComponent.ir.txt | 20 ----- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 46 ----------- .../TestComponent.ir.txt | 21 ----- .../TestComponent.mappings.txt | 29 ------- .../TestComponent.codegen.cs | 38 --------- .../TestComponent.ir.txt | 20 ----- .../TestComponent.mappings.txt | 19 ----- .../TestComponent.codegen.cs | 37 --------- .../TestComponent.ir.txt | 21 ----- .../TestComponent.mappings.txt | 10 --- .../TestComponent.codegen.cs | 31 -------- .../TestComponent.ir.txt | 18 ----- .../TestComponent.mappings.txt | 9 --- .../Regression_597/TestComponent.codegen.cs | 31 -------- .../Regression_597/TestComponent.ir.txt | 22 ------ .../Regression_597/TestComponent.mappings.txt | 9 --- .../Regression_609/TestComponent.codegen.cs | 34 -------- .../Regression_609/TestComponent.ir.txt | 30 ------- .../Regression_609/TestComponent.mappings.txt | 11 --- .../Regression_772/TestComponent.codegen.cs | 26 ------- .../TestComponent.diagnostics.txt | 2 - .../Regression_772/TestComponent.ir.txt | 17 ---- .../Regression_773/TestComponent.codegen.cs | 26 ------- .../Regression_773/TestComponent.ir.txt | 17 ---- .../Regression_784/TestComponent.codegen.cs | 35 --------- .../Regression_784/TestComponent.ir.txt | 26 ------- .../Regression_784/TestComponent.mappings.txt | 17 ---- .../TestComponent.codegen.cs | 30 ------- .../TestComponent.ir.txt | 25 ------ .../TestComponent.codegen.cs | 23 ------ .../TestComponent.ir.txt | 14 ---- .../TestComponent.codegen.cs | 24 ------ .../TestComponent.ir.txt | 13 ---- .../TestComponent.codegen.cs | 23 ------ .../TestComponent.ir.txt | 13 ---- 480 files changed, 13752 deletions(-) delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs delete mode 100644 src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs deleted file mode 100644 index 6de3cb730f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using Microsoft.AspNetCore.Components; -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -using System.Threading.Tasks; - -#line default -#line hidden - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)"); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt deleted file mode 100644 index cc858bd23b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (47:1,16 [33] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - - CSharp - "async (e) => await Task.Delay(10)" - IntermediateToken - - CSharp - ) - HtmlContent - (84:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (84:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt deleted file mode 100644 index b97e7aa5a7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) -|using System.Threading.Tasks| -Generated Location: (266:10,0 [28] ) -|using System.Threading.Tasks| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs deleted file mode 100644 index d9db12dcf0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs +++ /dev/null @@ -1,42 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using Microsoft.AspNetCore.Components; -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -using System.Threading.Tasks; - -#line default -#line hidden - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - Task OnClick(UIMouseEventArgs e) - { - return Task.CompletedTask; - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt deleted file mode 100644 index feb915aee2..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt +++ /dev/null @@ -1,32 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n Task OnClick(UIMouseEventArgs e) \n {\n return Task.CompletedTask;\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt deleted file mode 100644 index 8e3a9e0d99..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt +++ /dev/null @@ -1,25 +0,0 @@ -Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) -|using System.Threading.Tasks| -Generated Location: (266:10,0 [28] ) -|using System.Threading.Tasks| - -Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) -|OnClick| -Generated Location: (1028:27,133 [7] ) -|OnClick| - -Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) -| - Task OnClick(UIMouseEventArgs e) - { - return Task.CompletedTask; - } -| -Generated Location: (1151:31,12 [91] ) -| - Task OnClick(UIMouseEventArgs e) - { - return Task.CompletedTask; - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs deleted file mode 100644 index 6de3cb730f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using Microsoft.AspNetCore.Components; -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -using System.Threading.Tasks; - -#line default -#line hidden - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)"); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt deleted file mode 100644 index cc858bd23b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (47:1,16 [33] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - - CSharp - "async (e) => await Task.Delay(10)" - IntermediateToken - - CSharp - ) - HtmlContent - (84:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (84:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt deleted file mode 100644 index b97e7aa5a7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) -|using System.Threading.Tasks| -Generated Location: (266:10,0 [28] ) -|using System.Threading.Tasks| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs deleted file mode 100644 index 606261cf30..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs +++ /dev/null @@ -1,42 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using Microsoft.AspNetCore.Components; -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -using System.Threading.Tasks; - -#line default -#line hidden - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - Task OnClick() - { - return Task.CompletedTask; - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt deleted file mode 100644 index 0da76c0893..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt +++ /dev/null @@ -1,32 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n Task OnClick() \n {\n return Task.CompletedTask;\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt deleted file mode 100644 index b20efd8550..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt +++ /dev/null @@ -1,25 +0,0 @@ -Source Location: (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) -|using System.Threading.Tasks| -Generated Location: (266:10,0 [28] ) -|using System.Threading.Tasks| - -Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) -|OnClick| -Generated Location: (1028:27,133 [7] ) -|OnClick| - -Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) -| - Task OnClick() - { - return Task.CompletedTask; - } -| -Generated Location: (1151:31,12 [73] ) -| - Task OnClick() - { - return Task.CompletedTask; - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs deleted file mode 100644 index d0abedafaf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ParentValue - -#line default -#line hidden - )); - __o = new System.Action( - __value => ParentValue = __value); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt deleted file mode 100644 index 7295ad37a4..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - OnChanged - CSharpExpression - - IntermediateToken - - CSharp - __value => ParentValue = __value - HtmlContent - (81:1,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (81:1,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt deleted file mode 100644 index ebd53f042b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentValue| -Generated Location: (1164:29,35 [11] ) -|ParentValue| - -Source Location: (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1588:42,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs deleted file mode 100644 index 5a8ecbc709..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ParentValue - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt deleted file mode 100644 index 68aa44af9f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - HtmlContent - (81:1,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (81:1,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt deleted file mode 100644 index eb3e730a54..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentValue| -Generated Location: (1093:29,35 [11] ) -|ParentValue| - -Source Location: (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1543:41,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs deleted file mode 100644 index aa91ac7986..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ParentValue - -#line default -#line hidden - )); - __o = new System.Action( - __value => ParentValue = __value); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt deleted file mode 100644 index c75da4700b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - CSharpExpression - - IntermediateToken - - CSharp - __value => ParentValue = __value - HtmlContent - (71:1,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (71:1,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt deleted file mode 100644 index bf42d527ee..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentValue| -Generated Location: (1154:29,25 [11] ) -|ParentValue| - -Source Location: (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1578:42,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs deleted file mode 100644 index 611acf6ce4..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ParentValue - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt deleted file mode 100644 index b933602fea..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - HtmlContent - (71:1,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (71:1,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt deleted file mode 100644 index ed41ba9eac..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentValue| -Generated Location: (1083:29,25 [11] ) -|ParentValue| - -Source Location: (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1533:41,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs deleted file mode 100644 index f028961ecb..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ParentValue - -#line default -#line hidden - )); - __o = new System.Action( - __value => ParentValue = __value); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public string ParentValue { get; set; } = "42"; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt deleted file mode 100644 index 8a43c85cbe..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - CSharpExpression - - IntermediateToken - - CSharp - __value => ParentValue = __value - HtmlContent - (71:1,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (71:1,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (85:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (85:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string ParentValue { get; set; } = "42";\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt deleted file mode 100644 index a3e10bc4ef..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentValue| -Generated Location: (1154:29,25 [11] ) -|ParentValue| - -Source Location: (85:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) -| - public string ParentValue { get; set; } = "42"; -| -Generated Location: (1578:42,12 [55] ) -| - public string ParentValue { get; set; } = "42"; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 96562a892c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd"); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd"); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 45daf14a11..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,41 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text - HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate - IntermediateToken - - CSharp - , - IntermediateToken - - CSharp - "MM/dd" - IntermediateToken - - CSharp - ) - HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd") - HtmlContent - (108:1,77 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (108:1,77 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index 87ca7a8ac5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|CurrentDate| -Generated Location: (1005:27,71 [11] ) -|CurrentDate| - -Source Location: (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); -| -Generated Location: (1277:32,12 [77] ) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 684f352a03..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index dadfe0591b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,39 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text - HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - HtmlContent - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index e629286e38..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentValue| -Generated Location: (1005:27,71 [11] ) -|ParentValue| - -Source Location: (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1259:32,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index e768b0f0cf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public string ParentValue { get; set; } = "hi"; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 8621ce9bc9..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div - HtmlAttribute - (48:1,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (49:1,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - HtmlAttribute - (48:1,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - HtmlContent - (64:1,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (64:1,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string ParentValue { get; set; } = "hi";\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index 2e15f74625..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (49:1,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentValue| -Generated Location: (1005:27,71 [11] ) -|ParentValue| - -Source Location: (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) -| - public string ParentValue { get; set; } = "hi"; -| -Generated Location: (1259:32,12 [55] ) -| - public string ParentValue { get; set; } = "hi"; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index e768b0f0cf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public string ParentValue { get; set; } = "hi"; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 6bf6c30c87..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [27] x:\dir\subdir\Test\TestComponent.cshtml) - div - HtmlAttribute - (42:1,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (43:1,12 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - HtmlAttribute - (42:1,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - HtmlContent - (58:1,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:1,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string ParentValue { get; set; } = "hi";\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index cd366f6243..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (43:1,12 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentValue| -Generated Location: (1005:27,71 [11] ) -|ParentValue| - -Source Location: (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) -| - public string ParentValue { get; set; } = "hi"; -| -Generated Location: (1259:32,12 [55] ) -| - public string ParentValue { get; set; } = "hi"; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs deleted file mode 100644 index 4b556e6406..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,59 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment header = (context) => - -#line default -#line hidden - (builder2) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.ToLowerInvariant(); - -#line default -#line hidden - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - __o = new Microsoft.AspNetCore.Components.RenderFragment( -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - header - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt deleted file mode 100644 index 2da9c6fd7c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment header = (context) => - Template - (80:1,49 [37] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (80:1,49 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant() - CSharpCode - (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (123:2,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (151:2,28 [20] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (151:2,28 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n Some Content\n - ComponentAttributeExtensionNode - (143:2,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - Header - CSharpExpression - (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt deleted file mode 100644 index 325cb343a0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,25 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment header = (context) => | -Generated Location: (987:28,2 [46] ) -| RenderFragment header = (context) => | - -Source Location: (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) -|context.ToLowerInvariant()| -Generated Location: (1201:34,55 [26] ) -|context.ToLowerInvariant()| - -Source Location: (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (1414:40,87 [2] ) -|; | - -Source Location: (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|header| -Generated Location: (1607:46,21 [6] ) -|header| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs deleted file mode 100644 index d2554d64da..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,62 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment header = (context) => - -#line default -#line hidden - (builder2) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.ToLowerInvariant(); - -#line default -#line hidden - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - __o = new Microsoft.AspNetCore.Components.RenderFragment( -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - header - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt deleted file mode 100644 index 53a2f512d8..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,41 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment header = (context) => - Template - (80:1,49 [37] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (80:1,49 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant() - CSharpCode - (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (123:2,0 [114] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (155:3,2 [41] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlContent - (169:3,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (169:3,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some Content - ComponentChildContent - (200:4,2 [21] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - HtmlContent - (208:4,10 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (208:4,10 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Bye! - ComponentAttributeExtensionNode - (143:2,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - Header - CSharpExpression - (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt deleted file mode 100644 index 325cb343a0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,25 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment header = (context) => | -Generated Location: (987:28,2 [46] ) -| RenderFragment header = (context) => | - -Source Location: (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) -|context.ToLowerInvariant()| -Generated Location: (1201:34,55 [26] ) -|context.ToLowerInvariant()| - -Source Location: (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (1414:40,87 [2] ) -|; | - -Source Location: (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|header| -Generated Location: (1607:46,21 [6] ) -|header| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 72169e0d95..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(Enabled); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public bool Enabled { get; set; } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 5349927f27..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,39 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox - HtmlAttribute - (60:1,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (61:1,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled - IntermediateToken - - CSharp - ) - HtmlAttribute - (60:1,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled) - HtmlContent - (72:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (72:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public bool Enabled { get; set; }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index 4535b9812b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (61:1,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) -|Enabled| -Generated Location: (1005:27,71 [7] ) -|Enabled| - -Source Location: (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) -| - public bool Enabled { get; set; } -| -Generated Location: (1247:32,12 [41] ) -| - public bool Enabled { get; set; } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 7d61f92d2a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,42 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, Format); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - - public string Format { get; set; } = "MM/dd/yyyy"; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index bdd5856a21..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,41 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate - IntermediateToken - - CSharp - , - IntermediateToken - (85:1,54 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format - IntermediateToken - - CSharp - ) - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format) - HtmlContent - (94:1,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (94:1,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n public string Format { get; set; } = "MM/dd/yyyy";\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index 466721d41a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,28 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|CurrentDate| -Generated Location: (1005:27,71 [11] ) -|CurrentDate| - -Source Location: (85:1,54 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|Format| -Generated Location: (1018:27,84 [6] ) -|Format| - -Source Location: (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - - public string Format { get; set; } = "MM/dd/yyyy"; -| -Generated Location: (1275:32,12 [135] ) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - - public string Format { get; set; } = "MM/dd/yyyy"; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index f9fb164b2f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd/yyyy"); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy"); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 72fc1f0f07..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,41 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate - IntermediateToken - - CSharp - , - IntermediateToken - - CSharp - "MM/dd/yyyy" - IntermediateToken - - CSharp - ) - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy") - HtmlContent - (97:1,66 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (97:1,66 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index 7170fa644c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|CurrentDate| -Generated Location: (1005:27,71 [11] ) -|CurrentDate| - -Source Location: (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); -| -Generated Location: (1287:32,12 [77] ) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 684f352a03..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 2813471425..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,39 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - HtmlContent - (72:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (72:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index d2b22b616a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentValue| -Generated Location: (1005:27,71 [11] ) -|ParentValue| - -Source Location: (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1259:32,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 684f352a03..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index b791080153..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (44:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (45:1,14 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - HtmlAttribute - (44:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - HtmlContent - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index 08dab60ebf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (45:1,14 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentValue| -Generated Location: (1005:27,71 [11] ) -|ParentValue| - -Source Location: (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1259:32,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs deleted file mode 100644 index ea8dc2f926..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = typeof( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - string - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - "hi" - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt deleted file mode 100644 index 6d9d0292e4..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentTypeArgumentExtensionNode - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentAttributeExtensionNode - (63:1,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (64:1,33 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt deleted file mode 100644 index c8cfdec15a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt +++ /dev/null @@ -1,15 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|string| -Generated Location: (1031:29,19 [6] ) -|string| - -Source Location: (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) -|"hi"| -Generated Location: (1256:36,34 [4] ) -|"hi"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs deleted file mode 100644 index 9564c39735..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = typeof( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - string - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - Value - -#line default -#line hidden - )); - __o = new System.Action( - __value => Value = __value); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - string Value; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt deleted file mode 100644 index 0028e0a5d0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentTypeArgumentExtensionNode - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged - CSharpExpression - - IntermediateToken - - CSharp - __value => Value = __value - HtmlContent - (74:1,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (74:1,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string Value;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt deleted file mode 100644 index 07633fc4bb..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt +++ /dev/null @@ -1,24 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|string| -Generated Location: (1031:29,19 [6] ) -|string| - -Source Location: (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) -|Value| -Generated Location: (1311:36,36 [5] ) -|Value| - -Source Location: (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) -| - string Value; -| -Generated Location: (1717:49,12 [21] ) -| - string Value; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs deleted file mode 100644 index 03f32dcebf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs +++ /dev/null @@ -1,56 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = typeof( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - string - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - Value - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - string Value; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt deleted file mode 100644 index eead159f4f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentTypeArgumentExtensionNode - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) - HtmlContent - (74:1,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (74:1,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string Value;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt deleted file mode 100644 index 10234758f3..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt +++ /dev/null @@ -1,24 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|string| -Generated Location: (1031:29,19 [6] ) -|string| - -Source Location: (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) -|Value| -Generated Location: (1246:36,36 [5] ) -|Value| - -Source Location: (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) -| - string Value; -| -Generated Location: (1678:48,12 [21] ) -| - string Value; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index d1412ef37b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,66 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - 18 - -#line default -#line hidden - , -1, Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - Value - -#line default -#line hidden - ), -1, Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value)); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - string Value; - -#line default -#line hidden - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Value", __arg0); - builder.AddAttribute(__seq1, "Item", __arg1); - builder.AddAttribute(__seq2, "ItemChanged", __arg2); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt deleted file mode 100644 index 3ce37a7df2..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (66:1,35 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - CSharpExpression - (67:1,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (68:1,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18 - ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) - HtmlContent - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string Value;\n - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt deleted file mode 100644 index 23f5de23fc..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt +++ /dev/null @@ -1,24 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (68:1,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|18| -Generated Location: (1115:29,37 [2] ) -|18| - -Source Location: (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) -|Value| -Generated Location: (1297:35,23 [5] ) -|Value| - -Source Location: (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) -| - string Value; -| -Generated Location: (1564:43,12 [21] ) -| - string Value; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index a50ae877af..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,60 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - Value - -#line default -#line hidden - ), -1, - __value => Value = __value); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - string Value; - -#line default -#line hidden - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action __arg1) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.AddAttribute(__seq1, "ItemChanged", __arg1); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt deleted file mode 100644 index 8da25b3d5e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,39 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged - CSharpExpression - - IntermediateToken - - CSharp - __value => Value = __value - HtmlContent - (61:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (61:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (75:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (75:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string Value;\n - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt deleted file mode 100644 index 566c12bfe7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) -|Value| -Generated Location: (1154:29,23 [5] ) -|Value| - -Source Location: (75:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) -| - string Value; -| -Generated Location: (1367:38,12 [21] ) -| - string Value; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs deleted file mode 100644 index 84bb22d4ae..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,54 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = typeof( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - string - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - "hi" - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.ToLower(); - -#line default -#line hidden - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt deleted file mode 100644 index 5b20b6f6c4..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,37 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [90] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (72:1,41 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (72:1,41 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (76:2,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (82:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (82:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower() - HtmlContent - (105:2,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (105:2,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentTypeArgumentExtensionNode - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentAttributeExtensionNode - (63:1,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (64:1,33 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt deleted file mode 100644 index 62f2c6c68e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,20 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|string| -Generated Location: (1031:29,19 [6] ) -|string| - -Source Location: (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) -|"hi"| -Generated Location: (1256:36,34 [4] ) -|"hi"| - -Source Location: (82:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) -|context.ToLower()| -Generated Location: (1508:43,8 [17] ) -|context.ToLower()| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index 3952832c1b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,60 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - "hi" - -#line default -#line hidden - , -1, (context) => (builder2) => { -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.ToLower(); - -#line default -#line hidden - } - ); - } - #pragma warning restore 1998 - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.AddAttribute(__seq1, "ChildContent", __arg1); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt deleted file mode 100644 index 0c8dec9c50..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (59:1,28 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (59:1,28 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (63:2,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (69:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (69:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower() - HtmlContent - (92:2,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (92:2,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentAttributeExtensionNode - (50:1,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt deleted file mode 100644 index d966dab3c2..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt +++ /dev/null @@ -1,15 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) -|"hi"| -Generated Location: (1099:29,21 [4] ) -|"hi"| - -Source Location: (69:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) -|context.ToLower()| -Generated Location: (1243:35,8 [17] ) -|context.ToLower()| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs deleted file mode 100644 index e3f7ea641a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs +++ /dev/null @@ -1,56 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = typeof( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - string - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - "hi" - -#line default -#line hidden - ); - __o = -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - 17 - -#line default -#line hidden - ; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt deleted file mode 100644 index 18d0da6b2b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt +++ /dev/null @@ -1,32 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentTypeArgumentExtensionNode - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentAttributeExtensionNode - (63:1,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (64:1,33 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - ComponentAttributeExtensionNode - - Other - - CSharpExpression - (79:1,48 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (81:1,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt deleted file mode 100644 index 3fe96bdbc7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt +++ /dev/null @@ -1,20 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|string| -Generated Location: (1031:29,19 [6] ) -|string| - -Source Location: (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) -|"hi"| -Generated Location: (1256:36,34 [4] ) -|"hi"| - -Source Location: (81:1,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|17| -Generated Location: (1430:43,50 [2] ) -|17| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index 959b2015b6..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,59 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - "hi" - -#line default -#line hidden - , -1, -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - 17 - -#line default -#line hidden - ); - } - #pragma warning restore 1998 - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.AddAttribute(__seq1, "Other", __arg1); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt deleted file mode 100644 index fffdaf96ad..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,33 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (50:1,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - ComponentAttributeExtensionNode - - Other - - CSharpExpression - (66:1,35 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (68:1,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17 - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt deleted file mode 100644 index 565d353805..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt +++ /dev/null @@ -1,15 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) -|"hi"| -Generated Location: (1099:29,21 [4] ) -|"hi"| - -Source Location: (68:1,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|17| -Generated Location: (1244:35,37 [2] ) -|17| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index d77ffc4e7a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,52 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - "hi" - -#line default -#line hidden - ); - } - #pragma warning restore 1998 - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt deleted file mode 100644 index ffc822ec86..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (50:1,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt deleted file mode 100644 index ae90183a66..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) -|"hi"| -Generated Location: (1099:29,21 [4] ) -|"hi"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs deleted file mode 100644 index ee03dbe3e8..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs +++ /dev/null @@ -1,78 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - "hi" - -#line default -#line hidden - ); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, -1, -1, -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - "how are you?" - -#line default -#line hidden - ); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(builder, -1, -1, -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - "bye!" - -#line default -#line hidden - ); - } - #pragma warning restore 1998 - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.CloseComponent(); - } - public static void CreateMyComponent_1(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.CloseComponent(); - } - public static void CreateMyComponent_2(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt deleted file mode 100644 index 4c54493797..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt +++ /dev/null @@ -1,44 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (50:1,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - HtmlContent - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (62:2,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (81:2,19 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (82:2,20 [16] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (83:2,21 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "how are you?" - HtmlContent - (101:2,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (101:2,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (103:3,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (122:3,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (123:3,20 [8] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (124:3,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "bye!" - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_1 - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_2 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt deleted file mode 100644 index cde7b926ae..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt +++ /dev/null @@ -1,20 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) -|"hi"| -Generated Location: (1099:29,21 [4] ) -|"hi"| - -Source Location: (83:2,21 [14] x:\dir\subdir\Test\TestComponent.cshtml) -|"how are you?"| -Generated Location: (1317:36,21 [14] ) -|"how are you?"| - -Source Location: (124:3,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|"bye!"| -Generated Location: (1545:43,21 [6] ) -|"bye!"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs deleted file mode 100644 index 1ed68c5bc9..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs +++ /dev/null @@ -1,69 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = typeof( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - string - -#line default -#line hidden - ); - __o = typeof( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - int - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - "hi" - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.ToLower(); - -#line default -#line hidden - } - )); - builder.AddAttribute(-1, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment.Context>)((item) => (builder2) => { -#line 5 "x:\dir\subdir\Test\TestComponent.cshtml" -__o = System.Math.Max(0, item.Item); - -#line default -#line hidden - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt deleted file mode 100644 index 099d94fbcf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [228] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (88:2,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlElement - (102:2,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (108:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (108:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower() - ComponentChildContent - (148:3,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherChildContent - HtmlContent - (184:3,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (184:3,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpExpression - (189:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (189:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item) - HtmlContent - (218:4,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (218:4,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n - ComponentTypeArgumentExtensionNode - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem1 - IntermediateToken - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentTypeArgumentExtensionNode - (65:1,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2 - IntermediateToken - (65:1,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int - ComponentAttributeExtensionNode - (75:1,44 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (76:1,45 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (77:1,46 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt deleted file mode 100644 index d0914a96e8..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt +++ /dev/null @@ -1,30 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|string| -Generated Location: (1032:29,20 [6] ) -|string| - -Source Location: (65:1,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|int| -Generated Location: (1199:36,34 [3] ) -|int| - -Source Location: (77:1,46 [4] x:\dir\subdir\Test\TestComponent.cshtml) -|"hi"| -Generated Location: (1433:43,46 [4] ) -|"hi"| - -Source Location: (108:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) -|context.ToLower()| -Generated Location: (1699:50,22 [17] ) -|context.ToLower()| - -Source Location: (189:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) -|System.Math.Max(0, item.Item)| -Generated Location: (2014:58,6 [29] ) -|System.Math.Max(0, item.Item)| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index 3933f941a7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,75 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - "hi" - -#line default -#line hidden - , -1, -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - new List() - -#line default -#line hidden - , -1, (context) => (builder2) => { -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.ToLower(); - -#line default -#line hidden - } - , -1, (item) => (builder2) => { -#line 5 "x:\dir\subdir\Test\TestComponent.cshtml" -__o = System.Math.Max(0, item.Item); - -#line default -#line hidden - } - ); - } - #pragma warning restore 1998 - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment.Context> __arg3) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.AddAttribute(__seq1, "Items", __arg1); - builder.AddAttribute(__seq2, "ChildContent", __arg2); - builder.AddAttribute(__seq3, "AnotherChildContent", __arg3); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt deleted file mode 100644 index a388f98227..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,44 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [229] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentChildContent - (89:2,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlElement - (103:2,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (109:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (109:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower() - ComponentChildContent - (149:3,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherChildContent - HtmlContent - (185:3,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (185:3,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpExpression - (190:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (190:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item) - HtmlContent - (219:4,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (219:4,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n - ComponentAttributeExtensionNode - (50:1,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - ComponentAttributeExtensionNode - (65:1,34 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Items - Items - CSharpExpression - (66:1,35 [18] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (67:1,36 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new List() - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt deleted file mode 100644 index 3e4078529d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt +++ /dev/null @@ -1,25 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) -|"hi"| -Generated Location: (1099:29,21 [4] ) -|"hi"| - -Source Location: (67:1,36 [16] x:\dir\subdir\Test\TestComponent.cshtml) -|new List()| -Generated Location: (1243:35,36 [16] ) -|new List()| - -Source Location: (109:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) -|context.ToLower()| -Generated Location: (1413:41,22 [17] ) -|context.ToLower()| - -Source Location: (190:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) -|System.Math.Max(0, item.Item)| -Generated Location: (1581:48,6 [29] ) -|System.Math.Max(0, item.Item)| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs deleted file mode 100644 index 3c8fef1074..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt deleted file mode 100644 index 04bb07c5f8..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt deleted file mode 100644 index 3917573adf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs deleted file mode 100644 index 288be779ed..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt deleted file mode 100644 index f32a0f1d27..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (57:1,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (57:1,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some text - HtmlElement - (66:1,35 [42] x:\dir\subdir\Test\TestComponent.cshtml) - some-child - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - 1 - HtmlContent - (84:1,53 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (84:1,53 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Nested text - ComponentAttributeExtensionNode - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - HtmlContent - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt deleted file mode 100644 index 3917573adf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs deleted file mode 100644 index 3c8fef1074..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt deleted file mode 100644 index f08cf8b747..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,28 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [47] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlElement - (44:1,13 [20] x:\dir\subdir\Test\TestComponent.cshtml) - child - HtmlContent - (51:1,20 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (51:1,20 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - hello diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt deleted file mode 100644 index 3917573adf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs deleted file mode 100644 index 3c8fef1074..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt deleted file mode 100644 index 48021f51a0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (44:1,13 [34] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlContent - (58:1,27 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:1,27 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - hello diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt deleted file mode 100644 index 3917573adf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs deleted file mode 100644 index 61d34f7812..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs +++ /dev/null @@ -1,51 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = new System.Action( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - Increment - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private int counter; - private void Increment(UIEventArgs e) { - counter++; - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt deleted file mode 100644 index ae39bbd033..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (53:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - CSharpExpression - (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment - HtmlContent - (66:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (66:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - CSharpCode - (82:3,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (82:3,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private int counter;\n private void Increment(UIEventArgs e) {\n counter++;\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt deleted file mode 100644 index c6405d7c54..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt +++ /dev/null @@ -1,25 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) -|Increment| -Generated Location: (1091:29,23 [9] ) -|Increment| - -Source Location: (82:3,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) -| - private int counter; - private void Increment(UIEventArgs e) { - counter++; - } -| -Generated Location: (1412:40,12 [100] ) -| - private int counter; - private void Increment(UIEventArgs e) { - counter++; - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs deleted file mode 100644 index a2c066546a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context; - -#line default -#line hidden - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt deleted file mode 100644 index 26e2f26f43..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (44:1,13 [37] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - CSharpExpression - (59:1,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (59:1,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt deleted file mode 100644 index ca548bcd18..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (59:1,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) -|context| -Generated Location: (1160:29,28 [7] ) -|context| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs deleted file mode 100644 index ef63483411..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs +++ /dev/null @@ -1,42 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - 42.ToString() - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt deleted file mode 100644 index a1f995fc26..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (60:1,29 [16] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - StringProperty - CSharpExpression - (62:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (62:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 42.ToString() diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt deleted file mode 100644 index 81e7979f41..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (62:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) -|42.ToString()| -Generated Location: (1108:29,31 [13] ) -|42.ToString()| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs deleted file mode 100644 index 5b51e73b4e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.ToLowerInvariant(); - -#line default -#line hidden - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt deleted file mode 100644 index 5ac1905184..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [107] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (57:1,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (57:1,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some text - HtmlElement - (66:1,35 [58] x:\dir\subdir\Test\TestComponent.cshtml) - some-child - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - 1 - CSharpExpression - (85:1,54 [26] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (85:1,54 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant() - ComponentAttributeExtensionNode - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - HtmlContent - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt deleted file mode 100644 index 81a696b3b9..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (85:1,54 [26] x:\dir\subdir\Test\TestComponent.cshtml) -|context.ToLowerInvariant()| -Generated Location: (1209:30,54 [26] ) -|context.ToLowerInvariant()| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs deleted file mode 100644 index b7253041bf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((item) => (builder2) => { -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = item.ToLowerInvariant(); - -#line default -#line hidden - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt deleted file mode 100644 index af1d17208c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (61:2,2 [118] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlContent - (90:2,31 [15] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (90:2,31 [15] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n Some text - HtmlElement - (105:3,13 [55] x:\dir\subdir\Test\TestComponent.cshtml) - some-child - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - 1 - CSharpExpression - (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant() - HtmlContent - (160:3,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (160:3,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentAttributeExtensionNode - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - HtmlContent - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt deleted file mode 100644 index 5031c58513..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) -|item.ToLowerInvariant()| -Generated Location: (1184:30,32 [23] ) -|item.ToLowerInvariant()| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs deleted file mode 100644 index b7253041bf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((item) => (builder2) => { -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = item.ToLowerInvariant(); - -#line default -#line hidden - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt deleted file mode 100644 index abe035020b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (76:2,2 [103] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlContent - (90:2,16 [15] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (90:2,16 [15] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n Some text - HtmlElement - (105:3,13 [55] x:\dir\subdir\Test\TestComponent.cshtml) - some-child - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - 1 - CSharpExpression - (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant() - HtmlContent - (160:3,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (160:3,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentAttributeExtensionNode - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - HtmlContent - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt deleted file mode 100644 index 5031c58513..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) -|item.ToLowerInvariant()| -Generated Location: (1184:30,32 [23] ) -|item.ToLowerInvariant()| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs deleted file mode 100644 index e40582d4ef..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs +++ /dev/null @@ -1,51 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = new System.Action( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - e => { Increment(); } - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private int counter; - private void Increment() { - counter++; - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt deleted file mode 100644 index 4bc5d5e640..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (53:1,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - CSharpExpression - (54:1,23 [23] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (55:1,24 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - e => { Increment(); } - HtmlContent - (80:1,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (80:1,49 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - CSharpCode - (96:3,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (96:3,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private int counter;\n private void Increment() {\n counter++;\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt deleted file mode 100644 index 52bd507773..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt +++ /dev/null @@ -1,25 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (55:1,24 [21] x:\dir\subdir\Test\TestComponent.cshtml) -|e => { Increment(); }| -Generated Location: (1092:29,24 [21] ) -|e => { Increment(); }| - -Source Location: (96:3,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) -| - private int counter; - private void Increment() { - counter++; - } -| -Generated Location: (1425:40,12 [87] ) -| - private int counter; - private void Increment() { - counter++; - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs deleted file mode 100644 index eb6a81956e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,43 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = ""; - __o = -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - 43.ToString() - -#line default -#line hidden - ; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt deleted file mode 100644 index 7a7abec512..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - - some-attribute - - HtmlContent - (60:1,29 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (60:1,29 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - foo - ComponentAttributeExtensionNode - - another-attribute - - CSharpExpression - (84:1,53 [16] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:1,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 43.ToString() diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt deleted file mode 100644 index e441ce9d71..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (86:1,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) -|43.ToString()| -Generated Location: (1083:30,55 [13] ) -|43.ToString()| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs deleted file mode 100644 index 264122c83e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs +++ /dev/null @@ -1,45 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")] - [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")] - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - ((System.Action)(() => { -global::System.Object __typeHelper = "/MyPage"; - } - ))(); - ((System.Action)(() => { -global::System.Object __typeHelper = "/AnotherRoute/{id}"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt deleted file mode 100644 index bfbbf79448..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt +++ /dev/null @@ -1,28 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - RouteAttributeExtensionNode - - /MyPage - RouteAttributeExtensionNode - - /AnotherRoute/{id} - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - DirectiveToken - (37:1,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/MyPage" - DirectiveToken - (54:2,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) - "/AnotherRoute/{id}" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (76:3,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt deleted file mode 100644 index 201fe3fccc..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt +++ /dev/null @@ -1,15 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (644:17,38 [15] ) -|*, TestAssembly| - -Source Location: (37:1,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) -|"/MyPage"| -Generated Location: (760:21,37 [9] ) -|"/MyPage"| - -Source Location: (54:2,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) -|"/AnotherRoute/{id}"| -Generated Location: (869:25,37 [20] ) -|"/AnotherRoute/{id}"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs deleted file mode 100644 index 14f9c64fda..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - 123 - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - true - -#line default -#line hidden - ); - __o = ""; - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 6 "x:\dir\subdir\Test\TestComponent.cshtml" - new SomeType() - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt deleted file mode 100644 index 75f100aadc..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt +++ /dev/null @@ -1,33 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (63:2,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - IntProperty - IntermediateToken - (63:2,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 123 - ComponentAttributeExtensionNode - (87:3,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - BoolProperty - IntermediateToken - (87:3,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true - ComponentAttributeExtensionNode - (114:4,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - StringProperty - HtmlContent - (114:4,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (114:4,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - My string - ComponentAttributeExtensionNode - (146:5,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - ObjectProperty - IntermediateToken - (146:5,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new SomeType() diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt deleted file mode 100644 index c8b0c01001..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt +++ /dev/null @@ -1,20 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (63:2,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|123| -Generated Location: (1093:29,17 [3] ) -|123| - -Source Location: (87:3,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) -|true| -Generated Location: (1307:36,18 [4] ) -|true| - -Source Location: (146:5,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) -|new SomeType()| -Generated Location: (1546:44,20 [14] ) -|new SomeType()| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs deleted file mode 100644 index d6a9b8149c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - OnClick - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Action OnClick { get; set; } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt deleted file mode 100644 index c745f2e320..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt +++ /dev/null @@ -1,33 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement - Test.DynamicElement - ComponentAttributeExtensionNode - (56:1,25 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - onclick - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (57:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - HtmlContent - (68:1,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (68:1,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - CSharpCode - (84:3,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (84:3,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Action OnClick { get; set; }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt deleted file mode 100644 index 4902958cc5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (57:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) -|OnClick| -Generated Location: (1146:29,26 [7] ) -|OnClick| - -Source Location: (84:3,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Action OnClick { get; set; } -| -Generated Location: (1465:40,12 [62] ) -| - private Action OnClick { get; set; } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs deleted file mode 100644 index 2aa30acccf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs +++ /dev/null @@ -1,42 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - "very-cool" - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt deleted file mode 100644 index 0068449567..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - CoolnessMeter - Test.CoolnessMeter - ComponentAttributeExtensionNode - (56:1,25 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Coolness - Coolness - CSharpExpression - (57:1,26 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:1,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "very-cool" - HtmlContent - (74:1,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (74:1,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt deleted file mode 100644 index 2e5b895428..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (58:1,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|"very-cool"| -Generated Location: (1103:29,27 [11] ) -|"very-cool"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs deleted file mode 100644 index b7cb3a157a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs +++ /dev/null @@ -1,66 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -using Microsoft.AspNetCore.Components; - -#line default -#line hidden - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object TItem1 = null; - } - ))(); - ((System.Action)(() => { -global::System.Object TItem2 = null; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 6 "x:\dir\subdir\Test\TestComponent.cshtml" - foreach (var item2 in Items2) -{ - - -#line default -#line hidden -#line 9 "x:\dir\subdir\Test\TestComponent.cshtml" -__o = ChildContent(item2); - -#line default -#line hidden -#line 10 "x:\dir\subdir\Test\TestComponent.cshtml" - -} - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 12 "x:\dir\subdir\Test\TestComponent.cshtml" - - [Parameter] TItem1 Item1 { get; set; } - [Parameter] List Items2 { get; set; } - [Parameter] RenderFragment ChildContent { get; set; } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt deleted file mode 100644 index e7daa631fa..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt +++ /dev/null @@ -1,46 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (1:0,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem1 - DirectiveToken - (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2 - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (39:0,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (39:0,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlContent - (79:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (79:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (81:4,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1 - HtmlContent - (85:4,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (85:4,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Item1 - HtmlContent - (95:4,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:4,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item2 in Items2)\n{\n - HtmlElement - (136:7,4 [40] x:\dir\subdir\Test\TestComponent.cshtml) - p - HtmlContent - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpExpression - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ChildContent(item2) - HtmlContent - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n - CSharpCode - (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n} - HtmlContent - (179:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (179:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n [Parameter] TItem1 Item1 { get; set; }\n [Parameter] List Items2 { get; set; }\n [Parameter] RenderFragment ChildContent { get; set; }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt deleted file mode 100644 index d2ba18a0b0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt +++ /dev/null @@ -1,49 +0,0 @@ -Source Location: (1:0,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) -|using Microsoft.AspNetCore.Components;| -Generated Location: (257:10,0 [38] ) -|using Microsoft.AspNetCore.Components;| - -Source Location: (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|TItem1| -Generated Location: (581:19,22 [6] ) -|TItem1| - -Source Location: (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|TItem2| -Generated Location: (679:23,22 [6] ) -|TItem2| - -Source Location: (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) -|foreach (var item2 in Items2) -{ - | -Generated Location: (1159:36,1 [38] ) -|foreach (var item2 in Items2) -{ - | - -Source Location: (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) -|ChildContent(item2)| -Generated Location: (1287:43,6 [19] ) -|ChildContent(item2)| - -Source Location: (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) -| -}| -Generated Location: (1400:48,8 [3] ) -| -}| - -Source Location: (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) -| - [Parameter] TItem1 Item1 { get; set; } - [Parameter] List Items2 { get; set; } - [Parameter] RenderFragment ChildContent { get; set; } -| -Generated Location: (1549:56,12 [164] ) -| - [Parameter] TItem1 Item1 { get; set; } - [Parameter] List Items2 { get; set; } - [Parameter] RenderFragment ChildContent { get; set; } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs deleted file mode 100644 index 919a59d52a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt deleted file mode 100644 index bd6aceb134..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (17:1,0 [13] x:\dir\subdir\Test\TestComponent.cshtml) - div - HtmlContent - (22:1,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (22:1,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs deleted file mode 100644 index 633fcbe59d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = ""; - __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - myInstance = default(Test.MyComponent); - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt deleted file mode 100644 index 938a29719d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt +++ /dev/null @@ -1,37 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - - ParamBefore - - HtmlContent - (57:1,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (57:1,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before - RefExtensionNode - (70:1,39 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance - Test.MyComponent - ComponentAttributeExtensionNode - - ParamAfter - - HtmlContent - (94:1,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (94:1,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after - HtmlContent - (103:1,72 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (103:1,72 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlContent - (224:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (224:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (119:3,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (119:3,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Test.MyComponent myInstance;\n public void Foo() { System.GC.KeepAlive(myInstance); }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt deleted file mode 100644 index 8a41bd417e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt +++ /dev/null @@ -1,21 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (70:1,39 [10] x:\dir\subdir\Test\TestComponent.cshtml) -|myInstance| -Generated Location: (1221:33,39 [10] ) -|myInstance| - -Source Location: (119:3,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } -| -Generated Location: (1405:40,12 [104] ) -| - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs deleted file mode 100644 index 4622f728a7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - myInstance = default(Test.MyComponent); - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 6 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt deleted file mode 100644 index 7817dcfea3..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,42 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (76:1,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (76:1,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n Some - HtmlElement - (87:2,9 [16] x:\dir\subdir\Test\TestComponent.cshtml) - el - HtmlContent - (91:2,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (91:2,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - further - HtmlContent - (103:2,25 [10] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (103:2,25 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - content\n - RefExtensionNode - (49:1,18 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance - Test.MyComponent - ComponentAttributeExtensionNode - - SomeProp - - HtmlContent - (71:1,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (71:1,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val - HtmlContent - (127:3,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (127:3,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlContent - (248:8,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (248:8,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (143:5,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (143:5,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Test.MyComponent myInstance;\n public void Foo() { System.GC.KeepAlive(myInstance); }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt deleted file mode 100644 index 3d1c3b4c7b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,21 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (49:1,18 [10] x:\dir\subdir\Test\TestComponent.cshtml) -|myInstance| -Generated Location: (1177:32,18 [10] ) -|myInstance| - -Source Location: (143:5,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } -| -Generated Location: (1361:39,12 [104] ) -| - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs deleted file mode 100644 index 652f524371..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - myElem = default(Microsoft.AspNetCore.Components.ElementRef); - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Microsoft.AspNetCore.Components.ElementRef myElem; - public void Foo() { System.GC.KeepAlive(myElem); } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt deleted file mode 100644 index a073fd2d4a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [79] x:\dir\subdir\Test\TestComponent.cshtml) - elem - HtmlContent - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello - HtmlAttribute - - attributebefore=" - " - HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before - RefExtensionNode - (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem - Element - HtmlAttribute - - attributeafter=" - " - HtmlAttributeValue - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after - HtmlContent - (79:0,79 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (79:0,79 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlContent - (218:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (218:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Microsoft.AspNetCore.Components.ElementRef myElem;\n public void Foo() { System.GC.KeepAlive(myElem); }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt deleted file mode 100644 index 595c999d6f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt +++ /dev/null @@ -1,16 +0,0 @@ -Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|myElem| -Generated Location: (904:24,36 [6] ) -|myElem| - -Source Location: (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Microsoft.AspNetCore.Components.ElementRef myElem; - public void Foo() { System.GC.KeepAlive(myElem); } -| -Generated Location: (1110:31,12 [122] ) -| - private Microsoft.AspNetCore.Components.ElementRef myElem; - public void Foo() { System.GC.KeepAlive(myElem); } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs deleted file mode 100644 index b4a0c15da5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("alert(\"Test\");"); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt deleted file mode 100644 index adc6fd4a10..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt +++ /dev/null @@ -1,28 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - - CSharp - "alert(\"Test\");" - IntermediateToken - - CSharp - ) - HtmlContent - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs deleted file mode 100644 index 1232e09d7a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - void OnClick(UIEventArgs e) { - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt deleted file mode 100644 index 694f284ee0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n void OnClick(UIEventArgs e) {\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt deleted file mode 100644 index 965fd7554a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt +++ /dev/null @@ -1,16 +0,0 @@ -Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) -|OnClick| -Generated Location: (950:23,133 [7] ) -|OnClick| - -Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) -| - void OnClick(UIEventArgs e) { - } -| -Generated Location: (1073:27,12 [44] ) -| - void OnClick(UIEventArgs e) { - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs deleted file mode 100644 index 6dc4a0750a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - void OnClick(UIMouseEventArgs e) { - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt deleted file mode 100644 index a29f78db65..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n void OnClick(UIMouseEventArgs e) {\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt deleted file mode 100644 index 0a370a2d5f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt +++ /dev/null @@ -1,16 +0,0 @@ -Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) -|OnClick| -Generated Location: (950:23,133 [7] ) -|OnClick| - -Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) -| - void OnClick(UIMouseEventArgs e) { - } -| -Generated Location: (1073:27,12 [49] ) -| - void OnClick(UIMouseEventArgs e) { - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs deleted file mode 100644 index c49c3e267f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(x => { }); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt deleted file mode 100644 index 43fa8cb757..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { } - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt deleted file mode 100644 index 610f3730a8..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) -|x => { }| -Generated Location: (950:23,133 [8] ) -|x => { }| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs deleted file mode 100644 index 6dc4a0750a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - void OnClick(UIMouseEventArgs e) { - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt deleted file mode 100644 index a29f78db65..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n void OnClick(UIMouseEventArgs e) {\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt deleted file mode 100644 index 0a370a2d5f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt +++ /dev/null @@ -1,16 +0,0 @@ -Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) -|OnClick| -Generated Location: (950:23,133 [7] ) -|OnClick| - -Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) -| - void OnClick(UIMouseEventArgs e) { - } -| -Generated Location: (1073:27,12 [49] ) -| - void OnClick(UIMouseEventArgs e) { - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs deleted file mode 100644 index c49c3e267f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(x => { }); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt deleted file mode 100644 index 43fa8cb757..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { } - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt deleted file mode 100644 index 610f3730a8..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) -|x => { }| -Generated Location: (950:23,133 [8] ) -|x => { }| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs deleted file mode 100644 index b339a6b857..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - void OnClick() { - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt deleted file mode 100644 index ce1ec8f759..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n void OnClick() {\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt deleted file mode 100644 index f95192d92e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt +++ /dev/null @@ -1,16 +0,0 @@ -Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) -|OnClick| -Generated Location: (950:23,133 [7] ) -|OnClick| - -Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) -| - void OnClick() { - } -| -Generated Location: (1073:27,12 [31] ) -| - void OnClick() { - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs deleted file mode 100644 index 2479d0a29a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(() => { }); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt deleted file mode 100644 index 95e52fa87f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { } - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt deleted file mode 100644 index 5d5d60fe4c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) -|() => { }| -Generated Location: (950:23,133 [9] ) -|() => { }| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs deleted file mode 100644 index 87a6b631f7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("foo"); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt deleted file mode 100644 index 4cd6780e07..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - - CSharp - "foo" - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs deleted file mode 100644 index b545b34713..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs +++ /dev/null @@ -1,61 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = typeof( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - int - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - 3 - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - _my = default(Test.MyComponent); - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt deleted file mode 100644 index af3f05c9cb..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt +++ /dev/null @@ -1,35 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentTypeArgumentExtensionNode - (50:1,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int - ComponentAttributeExtensionNode - (60:1,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - IntermediateToken - (60:1,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3 - RefExtensionNode - (68:1,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my - Test.MyComponent - HtmlContent - (75:1,44 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (75:1,44 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlContent - (182:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (182:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (91:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (91:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private MyComponent _my;\n public void Foo() { System.GC.KeepAlive(_my); }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt deleted file mode 100644 index 0a61d8b69b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt +++ /dev/null @@ -1,31 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (50:1,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|int| -Generated Location: (1031:29,19 [3] ) -|int| - -Source Location: (60:1,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) -|3| -Generated Location: (1245:36,29 [1] ) -|3| - -Source Location: (68:1,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|_my| -Generated Location: (1534:45,37 [3] ) -|_my| - -Source Location: (91:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) -| - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } -| -Generated Location: (1716:52,12 [90] ) -| - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index eba8acca98..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,67 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - 3 - -#line default -#line hidden - , -1, (__value) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - _my = __value; - -#line default -#line hidden - } - ); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } - -#line default -#line hidden - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action> __arg1) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent)__value); }); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt deleted file mode 100644 index 6cd775d303..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (50:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - IntermediateToken - (50:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3 - RefExtensionNode - (58:1,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my - global::Test.MyComponent - HtmlContent - (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlContent - (172:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (172:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (81:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (81:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private MyComponent _my;\n public void Foo() { System.GC.KeepAlive(_my); }\n - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt deleted file mode 100644 index 870211d4c5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt +++ /dev/null @@ -1,26 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (50:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) -|3| -Generated Location: (1097:29,19 [1] ) -|3| - -Source Location: (58:1,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|_my| -Generated Location: (1243:35,27 [3] ) -|_my| - -Source Location: (81:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) -| - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } -| -Generated Location: (1433:44,12 [90] ) -| - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs deleted file mode 100644 index 06575bce03..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -__o = "My value"; - -#line default -#line hidden - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt deleted file mode 100644 index 1e3e6ce893..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpExpression - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "My value" - HtmlContent - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlElement - (17:2,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1 - HtmlContent - (21:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (21:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt deleted file mode 100644 index e4acf4e91b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) -|"My value"| -Generated Location: (874:24,6 [10] ) -|"My value"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs deleted file mode 100644 index 3c8fef1074..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt deleted file mode 100644 index b063139009..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n \n - ComponentExtensionNode - (36:2,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent - Test.SomeOtherComponent - HtmlContent - (58:2,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:2,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlElement - (62:4,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1 - HtmlContent - (66:4,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (66:4,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt deleted file mode 100644 index 3917573adf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs deleted file mode 100644 index d23ff3765d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -using System; - -#line default -#line hidden - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt deleted file mode 100644 index c2f340ba5b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - UsingDirective - (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) - System - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlElement - (17:2,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1 - HtmlContent - (21:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (21:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.mappings.txt deleted file mode 100644 index ae847626d3..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (1:0,1 [12] x:\dir\subdir\Test\TestComponent.cshtml) -|using System| -Generated Location: (282:10,0 [12] ) -|using System| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs deleted file mode 100644 index 69a65f5ce1..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,43 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = "bye!"; - -#line default -#line hidden - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt deleted file mode 100644 index 9cc23593bb..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (50:2,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - HtmlContent - (58:2,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:2,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hi! - ComponentChildContent - (76:3,4 [26] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - CSharpExpression - (86:3,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:3,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "bye!" diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt deleted file mode 100644 index cedac6119b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (86:3,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|"bye!"| -Generated Location: (1257:32,14 [6] ) -|"bye!"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs deleted file mode 100644 index a95a14e77e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs +++ /dev/null @@ -1,64 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment template = (context) => - -#line default -#line hidden - (builder2) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.Index; - -#line default -#line hidden -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.Item.ToLower(); - -#line default -#line hidden - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - __o = new Microsoft.AspNetCore.Components.RenderFragment( -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - template - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt deleted file mode 100644 index 5c76c02ce5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt +++ /dev/null @@ -1,43 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (35:1,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment template = (context) => - Template - (90:1,57 [48] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (90:1,57 [50] x:\dir\subdir\Test\TestComponent.cshtml) - li - HtmlContent - (94:1,61 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (94:1,61 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - # - CSharpExpression - (96:1,63 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (96:1,63 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Index - HtmlContent - (109:1,76 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (109:1,76 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \- - CSharpExpression - (113:1,80 [22] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (113:1,80 [22] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Item.ToLower() - CSharpCode - (140:1,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (140:1,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (145:2,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (168:2,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Template - Template - CSharpExpression - (169:2,24 [8] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (169:2,24 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template - HtmlContent - (180:2,35 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (180:2,35 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt deleted file mode 100644 index b518bb32e8..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt +++ /dev/null @@ -1,30 +0,0 @@ -Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) -|"*, TestAssembly"| -Generated Location: (502:15,37 [17] ) -|"*, TestAssembly"| - -Source Location: (35:1,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment template = (context) => | -Generated Location: (987:28,2 [54] ) -| RenderFragment template = (context) => | - -Source Location: (96:1,63 [13] x:\dir\subdir\Test\TestComponent.cshtml) -|context.Index| -Generated Location: (1217:34,63 [13] ) -|context.Index| - -Source Location: (113:1,80 [22] x:\dir\subdir\Test\TestComponent.cshtml) -|context.Item.ToLower()| -Generated Location: (1395:39,80 [22] ) -|context.Item.ToLower()| - -Source Location: (140:1,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (1624:45,107 [2] ) -|; | - -Source Location: (169:2,24 [8] x:\dir\subdir\Test\TestComponent.cshtml) -|template| -Generated Location: (1819:51,24 [8] ) -|template| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs deleted file mode 100644 index 64b2cd0629..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs +++ /dev/null @@ -1,64 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - RenderFragment p = (person) => - -#line default -#line hidden - (builder2) => { - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - person.Name - -#line default -#line hidden - ); - builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder3) => { - } - )); - } -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 5 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt deleted file mode 100644 index 6618985236..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt +++ /dev/null @@ -1,35 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n RenderFragment p = (person) => - Template - (81:2,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (81:2,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div - ComponentExtensionNode - (86:2,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (105:2,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - Name - CSharpExpression - (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - CSharpCode - (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n - CSharpCode - (144:4,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (144:4,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt deleted file mode 100644 index 2617c56e67..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt +++ /dev/null @@ -1,39 +0,0 @@ -Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) -|"*, TestAssembly"| -Generated Location: (502:15,37 [17] ) -|"*, TestAssembly"| - -Source Location: (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) -| - RenderFragment p = (person) => | -Generated Location: (987:28,2 [45] ) -| - RenderFragment p = (person) => | - -Source Location: (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|person.Name| -Generated Location: (1310:36,69 [11] ) -|person.Name| - -Source Location: (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|; -| -Generated Location: (1693:46,89 [3] ) -|; -| - -Source Location: (144:4,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } -| -Generated Location: (1839:53,12 [76] ) -| - class Person - { - public string Name { get; set; } - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs deleted file mode 100644 index dbbb8065b5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs +++ /dev/null @@ -1,72 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - RenderFragment p = (person) => - -#line default -#line hidden - (builder2) => { - __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - person.Name - -#line default -#line hidden - ); - builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder3) => { - } - )); - } -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { -#line 6 "x:\dir\subdir\Test\TestComponent.cshtml" -__o = "hello, world!"; - -#line default -#line hidden - } - )); - } - #pragma warning restore 1998 -#line 9 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt deleted file mode 100644 index 4674bf0e0e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt +++ /dev/null @@ -1,45 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n RenderFragment p = (person) => - Template - (81:2,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (81:2,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div - ComponentExtensionNode - (86:2,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (105:2,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - Name - CSharpExpression - (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - CSharpCode - (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n - ComponentExtensionNode - (132:4,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (145:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (145:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpExpression - (149:5,2 [15] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (149:5,2 [15] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hello, world!" - HtmlContent - (165:5,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (165:5,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlContent - (181:6,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (181:6,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - CSharpCode - (197:8,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (197:8,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt deleted file mode 100644 index dea3d8428f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt +++ /dev/null @@ -1,44 +0,0 @@ -Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) -|"*, TestAssembly"| -Generated Location: (502:15,37 [17] ) -|"*, TestAssembly"| - -Source Location: (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) -| - RenderFragment p = (person) => | -Generated Location: (987:28,2 [45] ) -| - RenderFragment p = (person) => | - -Source Location: (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|person.Name| -Generated Location: (1310:36,69 [11] ) -|person.Name| - -Source Location: (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|; -| -Generated Location: (1693:46,89 [3] ) -|; -| - -Source Location: (149:5,2 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|"hello, world!"| -Generated Location: (1903:52,6 [15] ) -|"hello, world!"| - -Source Location: (197:8,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } -| -Generated Location: (2096:61,12 [76] ) -| - class Person - { - public string Name { get; set; } - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs deleted file mode 100644 index 1c2e655a88..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs +++ /dev/null @@ -1,59 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment template = (person) => - -#line default -#line hidden - (builder2) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = person.Name; - -#line default -#line hidden - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - __o = new Microsoft.AspNetCore.Components.RenderFragment( -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - template - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt deleted file mode 100644 index 0b2d2a7eef..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt +++ /dev/null @@ -1,37 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (35:1,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment template = (person) => - Template - (83:1,50 [22] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (83:1,50 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (89:1,56 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (89:1,56 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - CSharpCode - (106:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (106:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (111:2,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (140:2,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) - PersonTemplate - PersonTemplate - CSharpExpression - (141:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (141:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template - HtmlContent - (152:2,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (152:2,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt deleted file mode 100644 index 83d796d983..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt +++ /dev/null @@ -1,25 +0,0 @@ -Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) -|"*, TestAssembly"| -Generated Location: (502:15,37 [17] ) -|"*, TestAssembly"| - -Source Location: (35:1,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment template = (person) => | -Generated Location: (987:28,2 [47] ) -| RenderFragment template = (person) => | - -Source Location: (89:1,56 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|person.Name| -Generated Location: (1203:34,56 [11] ) -|person.Name| - -Source Location: (106:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (1387:40,73 [2] ) -|; | - -Source Location: (141:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) -|template| -Generated Location: (1587:46,30 [8] ) -|template| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs deleted file mode 100644 index fe3b5a38c9..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,51 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -__o = RenderPerson((person) => (builder2) => { -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = person.Name; - -#line default -#line hidden -} -); - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt deleted file mode 100644 index 04ddbdf5e3..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpExpression - (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => - Template - (27:0,27 [22] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (27:0,27 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ) - HtmlContent - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (51:0,51 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n\n object RenderPerson(RenderFragment p) => null;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt deleted file mode 100644 index b37981c1a8..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt +++ /dev/null @@ -1,34 +0,0 @@ -Source Location: (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml) -|RenderPerson((person) => | -Generated Location: (874:24,6 [25] ) -|RenderPerson((person) => | - -Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|person.Name| -Generated Location: (1000:26,33 [11] ) -|person.Name| - -Source Location: (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) -|)| -Generated Location: (1048:31,0 [1] ) -|)| - -Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| -Generated Location: (1195:38,12 [138] ) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs deleted file mode 100644 index 1a513d9bfe..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs +++ /dev/null @@ -1,55 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - - RenderFragment p = (person) => - -#line default -#line hidden - (builder2) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = person.Name; - -#line default -#line hidden - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt deleted file mode 100644 index d04fb1ffca..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n RenderFragment p = (person) => - Template - (48:1,44 [22] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (48:1,44 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - CSharpCode - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n - CSharpCode - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt deleted file mode 100644 index b9045e5bb7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt +++ /dev/null @@ -1,34 +0,0 @@ -Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) -| - RenderFragment p = (person) => | -Generated Location: (870:24,2 [45] ) -| - RenderFragment p = (person) => | - -Source Location: (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|person.Name| -Generated Location: (1078:31,50 [11] ) -|person.Name| - -Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|; -| -Generated Location: (1256:37,67 [3] ) -|; -| - -Source Location: (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } -| -Generated Location: (1402:44,12 [76] ) -| - class Person - { - public string Name { get; set; } - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs deleted file mode 100644 index 0da3a367ff..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,51 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -__o = RenderPerson((person) => (builder2) => { -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = person.Name; - -#line default -#line hidden -} -); - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt deleted file mode 100644 index abc67e5715..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpExpression - (2:0,2 [48] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => - Template - (28:0,28 [22] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (28:0,28 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - IntermediateToken - (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ) - HtmlContent - (53:0,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (53:0,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n\n object RenderPerson(RenderFragment p) => null;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt deleted file mode 100644 index c11ce14a08..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt +++ /dev/null @@ -1,34 +0,0 @@ -Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) -|RenderPerson((person) => | -Generated Location: (874:24,6 [25] ) -|RenderPerson((person) => | - -Source Location: (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml) -|person.Name| -Generated Location: (1001:26,34 [11] ) -|person.Name| - -Source Location: (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml) -|)| -Generated Location: (1049:31,0 [1] ) -|)| - -Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| -Generated Location: (1196:38,12 [138] ) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs deleted file mode 100644 index a9dfa2f064..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs +++ /dev/null @@ -1,54 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment template = - -#line default -#line hidden - (builder2) => { - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - __o = -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - template - -#line default -#line hidden - ; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt deleted file mode 100644 index ce6182b349..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt +++ /dev/null @@ -1,37 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (35:1,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment template = - Template - (63:1,30 [15] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (63:1,30 [15] x:\dir\subdir\Test\TestComponent.cshtml) - div - HtmlContent - (68:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (68:1,35 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Joey - CSharpCode - (78:1,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (78:1,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (83:2,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - - Person - - CSharpExpression - (104:2,21 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (105:2,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template - HtmlContent - (116:2,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (116:2,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt deleted file mode 100644 index 4d64399583..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt +++ /dev/null @@ -1,20 +0,0 @@ -Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) -|"*, TestAssembly"| -Generated Location: (502:15,37 [17] ) -|"*, TestAssembly"| - -Source Location: (35:1,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment template = | -Generated Location: (987:28,2 [27] ) -| RenderFragment template = | - -Source Location: (78:1,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (1187:35,45 [2] ) -|; | - -Source Location: (105:2,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) -|template| -Generated Location: (1315:41,22 [8] ) -|template| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs deleted file mode 100644 index aef1427130..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -__o = RenderPerson((builder2) => { -} -); - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - object RenderPerson(RenderFragment p) => null; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt deleted file mode 100644 index 99a41a7949..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpExpression - (1:0,1 [27] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson( - Template - (15:0,15 [13] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (15:0,15 [13] x:\dir\subdir\Test\TestComponent.cshtml) - div - HtmlContent - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - HI - IntermediateToken - (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ) - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n object RenderPerson(RenderFragment p) => null;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt deleted file mode 100644 index 53fef3eae5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) -|RenderPerson(| -Generated Location: (874:24,6 [13] ) -|RenderPerson(| - -Source Location: (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) -|)| -Generated Location: (907:26,0 [1] ) -|)| - -Source Location: (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) -| - object RenderPerson(RenderFragment p) => null; -| -Generated Location: (1054:33,12 [54] ) -| - object RenderPerson(RenderFragment p) => null; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs deleted file mode 100644 index 866e1f96c6..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - y - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => y = __value, y); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - string y = null; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt deleted file mode 100644 index bd039a21c9..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - Counter - Test.Counter - ComponentAttributeExtensionNode - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => y = __value, y) - HtmlContent - (53:1,22 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (53:1,22 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlContent - (92:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (92:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (67:2,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (67:2,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string y = null;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt deleted file mode 100644 index b04372471a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) -|y| -Generated Location: (1075:29,17 [1] ) -|y| - -Source Location: (67:2,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) -| - string y = null; -| -Generated Location: (1495:41,12 [24] ) -| - string y = null; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs deleted file mode 100644 index 825aae87ed..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs +++ /dev/null @@ -1,58 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - UserName - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName); - __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - UserIsActive - -#line default -#line hidden - ); - __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - public string UserName { get; set; } - public bool UserIsActive { get; set; } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt deleted file mode 100644 index 762f8737ea..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt +++ /dev/null @@ -1,46 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (31:1,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - User - Test.User - ComponentAttributeExtensionNode - (48:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (49:1,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (48:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName) - ComponentAttributeExtensionNode - (74:1,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (75:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (74:1,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive) - HtmlContent - (91:1,60 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (91:1,60 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlContent - (196:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (196:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string UserName { get; set; }\n public bool UserIsActive { get; set; }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt deleted file mode 100644 index d01e84b908..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt +++ /dev/null @@ -1,26 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - -Source Location: (49:1,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) -|UserName| -Generated Location: (1076:29,18 [8] ) -|UserName| - -Source Location: (75:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) -|UserIsActive| -Generated Location: (1422:37,44 [12] ) -|UserIsActive| - -Source Location: (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) -| - public string UserName { get; set; } - public bool UserIsActive { get; set; } -| -Generated Location: (1875:49,12 [88] ) -| - public string UserName { get; set; } - public bool UserIsActive { get; set; } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs deleted file mode 100644 index 4f3db087b4..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - [Microsoft.AspNetCore.Components.RouteAttribute("/")] - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - ((System.Action)(() => { -global::System.Object __typeHelper = "/"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt deleted file mode 100644 index 57b2bc7949..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt +++ /dev/null @@ -1,2 +0,0 @@ -x:\dir\subdir\Test\TestComponent.cshtml(8,2): Error RZ1035: Missing close angle for tag helper 'SurveyPrompt'. -x:\dir\subdir\Test\TestComponent.cshtml(8,2): Error RZ1034: Found a malformed 'SurveyPrompt' tag helper. Tag helpers must have a start and end tag or be self closing. diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt deleted file mode 100644 index 37b5fb19ad..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - RouteAttributeExtensionNode - - / - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - DirectiveToken - (37:1,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) - "/" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlContent - (42:2,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:2,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (44:3,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - h1 - HtmlContent - (48:3,4 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (48:3,4 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello, world! - HtmlContent - (66:3,22 [32] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (66:3,22 [32] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\nWelcome to your new app.\n\n - ComponentExtensionNode - (98:7,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt - Test.SurveyPrompt - ComponentAttributeExtensionNode - (119:7,21 [0] x:\dir\subdir\Test\TestComponent.cshtml) - Title - Title - HtmlContent - (119:7,21 [0] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (119:7,21 [0] x:\dir\subdir\Test\TestComponent.cshtml) - Html - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt deleted file mode 100644 index a9b5edf72a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (562:16,38 [15] ) -|*, TestAssembly| - -Source Location: (37:1,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|"/"| -Generated Location: (678:20,37 [3] ) -|"/"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs deleted file mode 100644 index 4f3db087b4..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - [Microsoft.AspNetCore.Components.RouteAttribute("/")] - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - ((System.Action)(() => { -global::System.Object __typeHelper = "/"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt deleted file mode 100644 index 8e11bee99a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - RouteAttributeExtensionNode - - / - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - DirectiveToken - (37:1,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) - "/" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlContent - (42:2,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:2,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (44:3,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - h1 - HtmlContent - (48:3,4 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (48:3,4 [13] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello, world! - HtmlContent - (66:3,22 [32] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (66:3,22 [32] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\nWelcome to your new app.\n\n - ComponentExtensionNode - (98:7,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt - Test.SurveyPrompt - ComponentAttributeExtensionNode - (119:7,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Title - Title - HtmlContent - (119:7,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (119:7,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html -
    Test!
    - HtmlContent - (139:7,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (139:7,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt deleted file mode 100644 index a9b5edf72a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (562:16,38 [15] ) -|*, TestAssembly| - -Source Location: (37:1,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|"/"| -Generated Location: (678:20,37 [3] ) -|"/"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs deleted file mode 100644 index e27aca9ed6..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs +++ /dev/null @@ -1,44 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnComponentHover); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = ParentBgColor; - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - public string ParentBgColor { get; set; } = "#FFFFFF"; - - public void OnComponentHover(UIMouseEventArgs e) - { - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt deleted file mode 100644 index f05985b010..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt +++ /dev/null @@ -1,39 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p - HtmlAttribute - (16:0,16 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover - IntermediateToken - - CSharp - ) - HtmlAttribute - - style=" - " - HtmlAttributeValue - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background: - CSharpExpressionAttributeValue - (53:0,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor - HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ; - HtmlContent - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlContent - (220:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (220:7,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string ParentBgColor { get; set; } = "#FFFFFF";\n\n public void OnComponentHover(UIMouseEventArgs e)\n {\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt deleted file mode 100644 index dfe4ea339c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt +++ /dev/null @@ -1,27 +0,0 @@ -Source Location: (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) -|OnComponentHover| -Generated Location: (950:23,133 [16] ) -|OnComponentHover| - -Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) -|ParentBgColor| -Generated Location: (1076:25,55 [13] ) -|ParentBgColor| - -Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) -| - public string ParentBgColor { get; set; } = "#FFFFFF"; - - public void OnComponentHover(UIMouseEventArgs e) - { - } -| -Generated Location: (1235:32,12 [132] ) -| - public string ParentBgColor { get; set; } = "#FFFFFF"; - - public void OnComponentHover(UIMouseEventArgs e) - { - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs deleted file mode 100644 index 919a59d52a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt deleted file mode 100644 index 50d67b6e07..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt +++ /dev/null @@ -1,36 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [144] x:\dir\subdir\Test\TestComponent.cshtml) - div - HtmlContent - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (11:1,4 [125] x:\dir\subdir\Test\TestComponent.cshtml) - script - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - some/url.js - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - - HtmlContent - (78:1,71 [49] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (78:1,71 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n some text\n some more text\n - HtmlContent - (136:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (136:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlContent - (144:5,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (144:5,6 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs deleted file mode 100644 index a041c175f6..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" -__o = "My value"; - -#line default -#line hidden - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt deleted file mode 100644 index e35b51185f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1 - HtmlContent - (4:0,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (4:0,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello - HtmlContent - (14:0,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (14:0,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - CSharpExpression - (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "My value" - HtmlContent - (31:2,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (31:2,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt deleted file mode 100644 index 1184d613a7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) -|"My value"| -Generated Location: (874:24,6 [10] ) -|"My value"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs deleted file mode 100644 index 3c8fef1074..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt deleted file mode 100644 index f837db0a99..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (29:0,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (31:1,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1 - HtmlContent - (35:1,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello - HtmlContent - (45:1,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (45:1,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - ComponentExtensionNode - (49:3,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent - Test.SomeOtherComponent - HtmlContent - (71:3,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (71:3,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt deleted file mode 100644 index 3917573adf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) -|*, TestAssembly| -Generated Location: (503:15,38 [15] ) -|*, TestAssembly| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs deleted file mode 100644 index 138dcf99f7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - [Microsoft.AspNetCore.Components.RouteAttribute("/my/url")] - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "/my/url"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt deleted file mode 100644 index d220046235..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components - RouteAttributeExtensionNode - - /my/url - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - DesignTimeDirective - - DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (24:2,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/my/url" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1 - HtmlContent - (4:0,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (4:0,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello - HtmlContent - (14:0,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (14:0,14 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlContent - (35:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt deleted file mode 100644 index 1b7602da30..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt +++ /dev/null @@ -1,5 +0,0 @@ -Source Location: (24:2,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) -|"/my/url"| -Generated Location: (567:16,37 [9] ) -|"/my/url"| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs deleted file mode 100644 index 7334305407..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using Microsoft.AspNetCore.Components; - using System.Threading.Tasks; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)")); - builder.CloseElement(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt deleted file mode 100644 index 98688cef84..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (47:1,16 [33] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - - CSharp - "async (e) => await Task.Delay(10)" - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs deleted file mode 100644 index ee72b453c7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using Microsoft.AspNetCore.Components; - using System.Threading.Tasks; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - Task OnClick(UIMouseEventArgs e) - { - return Task.CompletedTask; - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt deleted file mode 100644 index b24c7a572d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - CSharpCode - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n Task OnClick(UIMouseEventArgs e) \n {\n return Task.CompletedTask;\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt deleted file mode 100644 index 5bada6842b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt +++ /dev/null @@ -1,15 +0,0 @@ -Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) -| - Task OnClick(UIMouseEventArgs e) - { - return Task.CompletedTask; - } -| -Generated Location: (918:22,12 [91] ) -| - Task OnClick(UIMouseEventArgs e) - { - return Task.CompletedTask; - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs deleted file mode 100644 index 7334305407..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using Microsoft.AspNetCore.Components; - using System.Threading.Tasks; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)")); - builder.CloseElement(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt deleted file mode 100644 index 98688cef84..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (47:1,16 [33] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - - CSharp - "async (e) => await Task.Delay(10)" - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs deleted file mode 100644 index 66065b377c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using Microsoft.AspNetCore.Components; - using System.Threading.Tasks; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - Task OnClick() - { - return Task.CompletedTask; - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt deleted file mode 100644 index b1f0a37924..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - CSharpCode - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n Task OnClick() \n {\n return Task.CompletedTask;\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt deleted file mode 100644 index f459f65370..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt +++ /dev/null @@ -1,15 +0,0 @@ -Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) -| - Task OnClick() - { - return Task.CompletedTask; - } -| -Generated Location: (918:22,12 [73] ) -| - Task OnClick() - { - return Task.CompletedTask; - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs deleted file mode 100644 index 1024358967..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue))); - builder.AddAttribute(2, "OnChanged", new System.Action(__value => ParentValue = __value)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt deleted file mode 100644 index 828e856cc5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - OnChanged - CSharpExpression - - IntermediateToken - - CSharp - __value => ParentValue = __value - CSharpCode - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt deleted file mode 100644 index 39e5375176..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1061:23,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs deleted file mode 100644 index e7807b0bac..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt deleted file mode 100644 index 8381d3fa92..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - CSharpCode - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt deleted file mode 100644 index 33a43a37f3..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1030:23,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs deleted file mode 100644 index 5a8c21bf6d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue))); - builder.AddAttribute(2, "ValueChanged", new System.Action(__value => ParentValue = __value)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt deleted file mode 100644 index fe38f2c035..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - CSharpExpression - - IntermediateToken - - CSharp - __value => ParentValue = __value - CSharpCode - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt deleted file mode 100644 index ab302becd2..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1064:23,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs deleted file mode 100644 index c444fed0d0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt deleted file mode 100644 index 27e972b7bf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - CSharpCode - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt deleted file mode 100644 index 791d24c7dc..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1033:23,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs deleted file mode 100644 index bb98cf1889..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue))); - builder.AddAttribute(2, "ValueChanged", new System.Action(__value => ParentValue = __value)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public string ParentValue { get; set; } = "42"; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt deleted file mode 100644 index c1dbbf4635..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged - CSharpExpression - - IntermediateToken - - CSharp - __value => ParentValue = __value - CSharpCode - (85:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (85:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string ParentValue { get; set; } = "42";\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt deleted file mode 100644 index 2504e46ac7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (85:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) -| - public string ParentValue { get; set; } = "42"; -| -Generated Location: (1064:23,12 [55] ) -| - public string ParentValue { get; set; } = "42"; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index f12516fd5e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "type", "text"); - builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd")); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd")); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 6db3eedcb5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text - HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate - IntermediateToken - - CSharp - , - IntermediateToken - - CSharp - "MM/dd" - IntermediateToken - - CSharp - ) - HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd") - CSharpCode - (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index d1cbd5da55..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); -| -Generated Location: (1088:24,12 [77] ) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index c46a006cef..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "type", "text"); - builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index d2f4a5ac3d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text - HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - CSharpCode - (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index 2aff49febc..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1070:24,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 29f0c99c5d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "div"); - builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public string ParentValue { get; set; } = "hi"; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 55cbf4c344..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div - HtmlAttribute - (48:1,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (49:1,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - HtmlAttribute - (48:1,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - CSharpCode - (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string ParentValue { get; set; } = "hi";\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index babd720e35..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) -| - public string ParentValue { get; set; } = "hi"; -| -Generated Location: (1015:23,12 [55] ) -| - public string ParentValue { get; set; } = "hi"; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 29f0c99c5d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "div"); - builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public string ParentValue { get; set; } = "hi"; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 22ff3383df..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [27] x:\dir\subdir\Test\TestComponent.cshtml) - div - HtmlAttribute - (42:1,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (43:1,12 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - HtmlAttribute - (42:1,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - CSharpCode - (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string ParentValue { get; set; } = "hi";\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index c8ff92005e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) -| - public string ParentValue { get; set; } = "hi"; -| -Generated Location: (1015:23,12 [55] ) -| - public string ParentValue { get; set; } = "hi"; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs deleted file mode 100644 index 0213a46786..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,43 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment header = (context) => - -#line default -#line hidden - (builder2) => { - builder2.OpenElement(0, "div"); - builder2.AddContent(1, context.ToLowerInvariant()); - builder2.CloseElement(); - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - builder.OpenComponent(2); - builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment(header)); - builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - builder2.AddContent(5, "\n Some Content\n"); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt deleted file mode 100644 index 15c209e72c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment header = (context) => - Template - (80:1,49 [37] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (80:1,49 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant() - CSharpCode - (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (123:2,0 [62] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (151:2,28 [20] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (151:2,28 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n Some Content\n - ComponentAttributeExtensionNode - (143:2,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - Header - CSharpExpression - (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt deleted file mode 100644 index 5e6eb01dfa..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment header = (context) => | -Generated Location: (602:17,2 [46] ) -| RenderFragment header = (context) => | - -Source Location: (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (1023:27,87 [2] ) -|; | - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs deleted file mode 100644 index 0de09fc2a2..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,47 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment header = (context) => - -#line default -#line hidden - (builder2) => { - builder2.OpenElement(0, "div"); - builder2.AddContent(1, context.ToLowerInvariant()); - builder2.CloseElement(); - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - builder.OpenComponent(2); - builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment(header)); - builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - builder2.AddContent(5, "Some Content"); - } - )); - builder.AddAttribute(6, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - builder2.AddContent(7, "Bye!"); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt deleted file mode 100644 index dd0662b682..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment header = (context) => - Template - (80:1,49 [37] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (80:1,49 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant() - CSharpCode - (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (123:2,0 [114] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (155:3,2 [41] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlContent - (169:3,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (169:3,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some Content - ComponentChildContent - (200:4,2 [21] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - HtmlContent - (208:4,10 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (208:4,10 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Bye! - ComponentAttributeExtensionNode - (143:2,20 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Header - Header - CSharpExpression - (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - header diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt deleted file mode 100644 index 5e6eb01dfa..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment header = (context) => | -Generated Location: (602:17,2 [46] ) -| RenderFragment header = (context) => | - -Source Location: (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (1023:27,87 [2] ) -|; | - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 0b3d4b0115..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "type", "checkbox"); - builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindMethods.GetValue(Enabled)); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public bool Enabled { get; set; } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 2b48165ac5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox - HtmlAttribute - (60:1,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (61:1,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled - IntermediateToken - - CSharp - ) - HtmlAttribute - (60:1,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled) - CSharpCode - (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public bool Enabled { get; set; }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index dcc4eef3a2..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) -| - public bool Enabled { get; set; } -| -Generated Location: (1064:24,12 [41] ) -| - public bool Enabled { get; set; } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index d347475c38..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,34 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "type", "text"); - builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, Format)); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - - public string Format { get; set; } = "MM/dd/yyyy"; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 5540459507..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [63] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate - IntermediateToken - - CSharp - , - IntermediateToken - (85:1,54 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format - IntermediateToken - - CSharp - ) - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format) - CSharpCode - (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n public string Format { get; set; } = "MM/dd/yyyy";\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index 40918f657f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,13 +0,0 @@ -Source Location: (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - - public string Format { get; set; } = "MM/dd/yyyy"; -| -Generated Location: (1086:24,12 [135] ) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - - public string Format { get; set; } = "MM/dd/yyyy"; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 415e7664c9..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "type", "text"); - builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd/yyyy")); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index dc862daa4b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [66] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate - IntermediateToken - - CSharp - , - IntermediateToken - - CSharp - "MM/dd/yyyy" - IntermediateToken - - CSharp - ) - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy") - CSharpCode - (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index 1096d43fa1..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); -| -Generated Location: (1098:24,12 [77] ) -| - public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index c46a006cef..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "type", "text"); - builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index c935b42bd5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - - type=" - " - HtmlAttributeValue - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - CSharpCode - (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index aa078259ce..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1070:24,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs deleted file mode 100644 index 28468ad17a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - public int ParentValue { get; set; } = 42; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt deleted file mode 100644 index 5ffdd8b1d7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (44:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (45:1,14 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue - IntermediateToken - - CSharp - ) - HtmlAttribute - (44:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) - CSharpCode - (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt deleted file mode 100644 index f3ac3c4290..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) -| - public int ParentValue { get; set; } = 42; -| -Generated Location: (1016:23,12 [50] ) -| - public int ParentValue { get; set; } = 42; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs deleted file mode 100644 index 847cb43fac..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck("hi")); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt deleted file mode 100644 index 9fba5ff2bf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentTypeArgumentExtensionNode - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentAttributeExtensionNode - (63:1,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (64:1,33 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs deleted file mode 100644 index 164ee4e0ef..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue(Value))); - builder.AddAttribute(2, "ItemChanged", new System.Action(__value => Value = __value)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - string Value; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt deleted file mode 100644 index a0bade6d00..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentTypeArgumentExtensionNode - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged - CSharpExpression - - IntermediateToken - - CSharp - __value => Value = __value - CSharpCode - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string Value;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt deleted file mode 100644 index a8c3e765da..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) -| - string Value; -| -Generated Location: (1046:23,12 [21] ) -| - string Value; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs deleted file mode 100644 index faa5f80265..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.BindMethods.GetValue(Value)); - builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - string Value; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt deleted file mode 100644 index a95252463e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentTypeArgumentExtensionNode - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) - CSharpCode - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string Value;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt deleted file mode 100644 index 2cc63bc14b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) -| - string Value; -| -Generated Location: (1021:23,12 [21] ) -| - string Value; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index e6f6d19f05..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,43 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 18, 2, Microsoft.AspNetCore.Components.BindMethods.GetValue(Value), 3, Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value)); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - string Value; - -#line default -#line hidden - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Value", __arg0); - builder.AddAttribute(__seq1, "Item", __arg1); - builder.AddAttribute(__seq2, "ItemChanged", __arg2); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt deleted file mode 100644 index 7b2b87cdfa..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,28 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [42] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (66:1,35 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value - CSharpExpression - (67:1,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (68:1,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18 - ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) - CSharpCode - (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string Value;\n - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt deleted file mode 100644 index 38ff236a02..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) -| - string Value; -| -Generated Location: (919:20,12 [21] ) -| - string Value; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index c2808ab0c6..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,42 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(Value), 2, __value => Value = __value); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - string Value; - -#line default -#line hidden - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action __arg1) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.AddAttribute(__seq1, "ItemChanged", __arg1); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt deleted file mode 100644 index a90c592808..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged - CSharpExpression - - IntermediateToken - - CSharp - __value => Value = __value - CSharpCode - (75:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (75:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string Value;\n - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt deleted file mode 100644 index fe2d718f6b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (75:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) -| - string Value; -| -Generated Location: (844:20,12 [21] ) -| - string Value; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs deleted file mode 100644 index 8d7563e2ae..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck("hi")); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { - builder2.AddContent(3, "\n "); - builder2.OpenElement(4, "div"); - builder2.AddContent(5, context.ToLower()); - builder2.CloseElement(); - builder2.AddContent(6, "\n"); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt deleted file mode 100644 index ec6dc1c525..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [90] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (72:1,41 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (72:1,41 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (76:2,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (82:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (82:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower() - HtmlContent - (105:2,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (105:2,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentTypeArgumentExtensionNode - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentAttributeExtensionNode - (63:1,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (64:1,33 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index e9fc0b231e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,43 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, (context) => (builder2) => { - builder2.AddContent(3, "\n "); - builder2.OpenElement(4, "div"); - builder2.AddContent(5, context.ToLower()); - builder2.CloseElement(); - builder2.AddContent(6, "\n"); - } - ); - } - #pragma warning restore 1998 - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.AddAttribute(__seq1, "ChildContent", __arg1); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt deleted file mode 100644 index 265a73f242..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (59:1,28 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (59:1,28 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (63:2,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (69:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (69:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower() - HtmlContent - (92:2,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (92:2,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentAttributeExtensionNode - (50:1,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs deleted file mode 100644 index c50be2453f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs +++ /dev/null @@ -1,25 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck("hi")); - builder.AddAttribute(2, "Other", 17); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt deleted file mode 100644 index 9910509f0a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [56] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentTypeArgumentExtensionNode - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentAttributeExtensionNode - (63:1,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (64:1,33 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - ComponentAttributeExtensionNode - - Other - - CSharpExpression - (79:1,48 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (81:1,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index 49e4bd2ea6..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, 17); - } - #pragma warning restore 1998 - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.AddAttribute(__seq1, "Other", __arg1); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt deleted file mode 100644 index 39aba3881e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (50:1,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - ComponentAttributeExtensionNode - - Other - - CSharpExpression - (66:1,35 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (68:1,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 17 - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index a4e8100787..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi"); - } - #pragma warning restore 1998 - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt deleted file mode 100644 index 1f3f11272d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,18 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (50:1,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs deleted file mode 100644 index 7d1d0e9102..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs +++ /dev/null @@ -1,51 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi"); - builder.AddContent(2, "\n"); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_1(builder, 3, 4, "how are you?"); - builder.AddContent(5, "\n"); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_2(builder, 6, 7, "bye!"); - } - #pragma warning restore 1998 - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.CloseComponent(); - } - public static void CreateMyComponent_1(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.CloseComponent(); - } - public static void CreateMyComponent_2(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt deleted file mode 100644 index d8e96e6b7b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt +++ /dev/null @@ -1,32 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (50:1,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - HtmlContent - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (62:2,0 [39] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (81:2,19 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (82:2,20 [16] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (83:2,21 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "how are you?" - HtmlContent - (101:2,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (101:2,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentExtensionNode - (103:3,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (122:3,19 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (123:3,20 [8] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (124:3,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "bye!" - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_1 - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_2 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs deleted file mode 100644 index 688b77b076..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck("hi")); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { - builder2.OpenElement(3, "div"); - builder2.AddContent(4, context.ToLower()); - builder2.CloseElement(); - } - )); - builder.AddAttribute(5, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment.Context>)((item) => (builder2) => { - builder2.AddContent(6, "\n "); - builder2.AddContent(7, System.Math.Max(0, item.Item)); - builder2.AddContent(8, ";\n"); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt deleted file mode 100644 index 6a69c8b163..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [228] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (88:2,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlElement - (102:2,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (108:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (108:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower() - ComponentChildContent - (148:3,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherChildContent - HtmlContent - (184:3,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (184:3,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpExpression - (189:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (189:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item) - HtmlContent - (218:4,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (218:4,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n - ComponentTypeArgumentExtensionNode - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem1 - IntermediateToken - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string - ComponentTypeArgumentExtensionNode - (65:1,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2 - IntermediateToken - (65:1,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int - ComponentAttributeExtensionNode - (75:1,44 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (76:1,45 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (77:1,46 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index 93d075fcb8..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, new List(), 3, (context) => (builder2) => { - builder2.OpenElement(4, "div"); - builder2.AddContent(5, context.ToLower()); - builder2.CloseElement(); - } - , 6, (item) => (builder2) => { - builder2.AddContent(7, "\n "); - builder2.AddContent(8, System.Math.Max(0, item.Item)); - builder2.AddContent(9, ";\n"); - } - ); - } - #pragma warning restore 1998 - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment.Context> __arg3) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.AddAttribute(__seq1, "Items", __arg1); - builder.AddAttribute(__seq2, "ChildContent", __arg2); - builder.AddAttribute(__seq3, "AnotherChildContent", __arg3); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt deleted file mode 100644 index 0f2f0df467..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,32 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [229] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentChildContent - (89:2,2 [58] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlElement - (103:2,16 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (109:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (109:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower() - ComponentChildContent - (149:3,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherChildContent - HtmlContent - (185:3,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (185:3,36 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpExpression - (190:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (190:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item) - HtmlContent - (219:4,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (219:4,32 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n - ComponentAttributeExtensionNode - (50:1,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - CSharpExpression - (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi" - ComponentAttributeExtensionNode - (65:1,34 [19] x:\dir\subdir\Test\TestComponent.cshtml) - Items - Items - CSharpExpression - (66:1,35 [18] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (67:1,36 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new List() - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs deleted file mode 100644 index 531a857416..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs +++ /dev/null @@ -1,23 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt deleted file mode 100644 index 51b5023e8a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt +++ /dev/null @@ -1,12 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs deleted file mode 100644 index 0d97d51a82..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "MyAttr", "abc"); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - builder2.AddContent(3, "Some text"); - builder2.AddMarkupContent(4, "Nested text"); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt deleted file mode 100644 index 2c493db032..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [91] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (57:1,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (57:1,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some text - HtmlBlock - - Nested text - ComponentAttributeExtensionNode - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - HtmlContent - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs deleted file mode 100644 index 81c9ffdeda..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,27 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - builder2.AddMarkupContent(2, "hello"); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt deleted file mode 100644 index ab64602394..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,14 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [47] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlBlock - - hello diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs deleted file mode 100644 index 9dada26355..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,27 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - builder2.AddContent(2, "hello"); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt deleted file mode 100644 index 06b0cceb11..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,15 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [61] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (44:1,13 [34] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlContent - (58:1,27 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:1,27 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - hello diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs deleted file mode 100644 index 9116082d4b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "OnClick", new System.Action(Increment)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private int counter; - private void Increment(UIEventArgs e) { - counter++; - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt deleted file mode 100644 index f3057c657e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (53:1,22 [10] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - CSharpExpression - (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Increment - CSharpCode - (82:3,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (82:3,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private int counter;\n private void Increment(UIEventArgs e) {\n counter++;\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt deleted file mode 100644 index 6eea8437b0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt +++ /dev/null @@ -1,15 +0,0 @@ -Source Location: (82:3,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) -| - private int counter; - private void Increment(UIEventArgs e) { - counter++; - } -| -Generated Location: (881:22,12 [100] ) -| - private int counter; - private void Increment(UIEventArgs e) { - counter++; - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs deleted file mode 100644 index 42ddaad1f1..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,27 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { - builder2.AddContent(2, context); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt deleted file mode 100644 index d10b873fb5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,15 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [64] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (44:1,13 [37] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - CSharpExpression - (59:1,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (59:1,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs deleted file mode 100644 index 6f9059be25..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(42.ToString())); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt deleted file mode 100644 index 4f55ddf214..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt +++ /dev/null @@ -1,15 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (60:1,29 [16] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - StringProperty - CSharpExpression - (62:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (62:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 42.ToString() diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs deleted file mode 100644 index cac7b04729..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "MyAttr", "abc"); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { - builder2.AddContent(3, "Some text"); - builder2.OpenElement(4, "some-child"); - builder2.AddAttribute(5, "a", "1"); - builder2.AddContent(6, context.ToLowerInvariant()); - builder2.CloseElement(); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt deleted file mode 100644 index fea8c42816..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [107] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (57:1,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (57:1,26 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Some text - HtmlElement - (66:1,35 [58] x:\dir\subdir\Test\TestComponent.cshtml) - some-child - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - 1 - CSharpExpression - (85:1,54 [26] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (85:1,54 [26] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLowerInvariant() - ComponentAttributeExtensionNode - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - HtmlContent - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs deleted file mode 100644 index b80253027c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "MyAttr", "abc"); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((item) => (builder2) => { - builder2.AddContent(3, "\n Some text"); - builder2.OpenElement(4, "some-child"); - builder2.AddAttribute(5, "a", "1"); - builder2.AddContent(6, item.ToLowerInvariant()); - builder2.CloseElement(); - builder2.AddContent(7, "\n "); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt deleted file mode 100644 index c08d7061ca..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (61:2,2 [118] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlContent - (90:2,31 [15] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (90:2,31 [15] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n Some text - HtmlElement - (105:3,13 [55] x:\dir\subdir\Test\TestComponent.cshtml) - some-child - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - 1 - CSharpExpression - (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant() - HtmlContent - (160:3,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (160:3,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentAttributeExtensionNode - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - HtmlContent - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs deleted file mode 100644 index b80253027c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "MyAttr", "abc"); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((item) => (builder2) => { - builder2.AddContent(3, "\n Some text"); - builder2.OpenElement(4, "some-child"); - builder2.AddAttribute(5, "a", "1"); - builder2.AddContent(6, item.ToLowerInvariant()); - builder2.CloseElement(); - builder2.AddContent(7, "\n "); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt deleted file mode 100644 index f5d06e567f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [164] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (76:2,2 [103] x:\dir\subdir\Test\TestComponent.cshtml) - ChildContent - HtmlContent - (90:2,16 [15] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (90:2,16 [15] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n Some text - HtmlElement - (105:3,13 [55] x:\dir\subdir\Test\TestComponent.cshtml) - some-child - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - 1 - CSharpExpression - (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant() - HtmlContent - (160:3,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (160:3,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - ComponentAttributeExtensionNode - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - HtmlContent - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (52:1,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs deleted file mode 100644 index 6d455d9ef9..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "OnClick", new System.Action(e => { Increment(); })); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private int counter; - private void Increment() { - counter++; - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt deleted file mode 100644 index 650e237e28..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (53:1,22 [24] x:\dir\subdir\Test\TestComponent.cshtml) - OnClick - OnClick - CSharpExpression - (54:1,23 [23] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (55:1,24 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - e => { Increment(); } - CSharpCode - (96:3,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (96:3,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private int counter;\n private void Increment() {\n counter++;\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt deleted file mode 100644 index 1e331a5dcb..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt +++ /dev/null @@ -1,15 +0,0 @@ -Source Location: (96:3,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) -| - private int counter; - private void Increment() { - counter++; - } -| -Generated Location: (893:22,12 [87] ) -| - private int counter; - private void Increment() { - counter++; - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs deleted file mode 100644 index 2e99450956..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs +++ /dev/null @@ -1,25 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "some-attribute", "foo"); - builder.AddAttribute(2, "another-attribute", 43.ToString()); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt deleted file mode 100644 index 81e15493f9..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt +++ /dev/null @@ -1,18 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - - some-attribute - - HtmlContent - (60:1,29 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (60:1,29 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - foo - ComponentAttributeExtensionNode - - another-attribute - - CSharpExpression - (84:1,53 [16] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:1,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 43.ToString() diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs deleted file mode 100644 index d3956e6d2e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs +++ /dev/null @@ -1,25 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")] - [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")] - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt deleted file mode 100644 index 5ed1562534..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt +++ /dev/null @@ -1,14 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - RouteAttributeExtensionNode - - /MyPage - RouteAttributeExtensionNode - - /AnotherRoute/{id} - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (76:3,0 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs deleted file mode 100644 index 5fd12339b2..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs +++ /dev/null @@ -1,27 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(123)); - builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(true)); - builder.AddAttribute(3, "StringProperty", "My string"); - builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(new SomeType())); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt deleted file mode 100644 index e56cec3e92..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [132] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (63:2,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntProperty - IntProperty - IntermediateToken - (63:2,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 123 - ComponentAttributeExtensionNode - (87:3,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - BoolProperty - BoolProperty - IntermediateToken - (87:3,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - true - ComponentAttributeExtensionNode - (114:4,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - StringProperty - StringProperty - HtmlContent - (114:4,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (114:4,20 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Html - My string - ComponentAttributeExtensionNode - (146:5,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - ObjectProperty - ObjectProperty - IntermediateToken - (146:5,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - new SomeType() diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs deleted file mode 100644 index 4bf707b825..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs +++ /dev/null @@ -1,30 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Action OnClick { get; set; } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt deleted file mode 100644 index 85be32648d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement - Test.DynamicElement - ComponentAttributeExtensionNode - (56:1,25 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - onclick - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (57:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - CSharpCode - (84:3,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (84:3,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Action OnClick { get; set; }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt deleted file mode 100644 index 9ddaeafa67..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (84:3,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Action OnClick { get; set; } -| -Generated Location: (934:22,12 [62] ) -| - private Action OnClick { get; set; } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs deleted file mode 100644 index adcb35739c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck("very-cool")); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt deleted file mode 100644 index 511caa57b3..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt +++ /dev/null @@ -1,15 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - CoolnessMeter - Test.CoolnessMeter - ComponentAttributeExtensionNode - (56:1,25 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Coolness - Coolness - CSharpExpression - (57:1,26 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:1,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "very-cool" diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs deleted file mode 100644 index 743a1d2535..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddMarkupContent(0, "

    Item1

    \n"); -#line 6 "x:\dir\subdir\Test\TestComponent.cshtml" - foreach (var item2 in Items2) -{ - -#line default -#line hidden - builder.AddContent(1, " "); - builder.OpenElement(2, "p"); - builder.AddContent(3, "\n "); - builder.AddContent(4, ChildContent(item2)); - builder.AddContent(5, ";\n "); - builder.CloseElement(); - builder.AddContent(6, "\n"); -#line 11 "x:\dir\subdir\Test\TestComponent.cshtml" -} - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 12 "x:\dir\subdir\Test\TestComponent.cshtml" - - [Parameter] TItem1 Item1 { get; set; } - [Parameter] List Items2 { get; set; } - [Parameter] RenderFragment ChildContent { get; set; } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt deleted file mode 100644 index 19ae93068d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (1:0,1 [40] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlBlock - -

    Item1

    \n - CSharpCode - (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item2 in Items2)\n{\n - HtmlContent - (132:7,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (132:7,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - - HtmlElement - (136:7,4 [40] x:\dir\subdir\Test\TestComponent.cshtml) - p - HtmlContent - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpExpression - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ChildContent(item2) - HtmlContent - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n - HtmlContent - (176:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (176:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - }\n - CSharpCode - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n [Parameter] TItem1 Item1 { get; set; }\n [Parameter] List Items2 { get; set; }\n [Parameter] RenderFragment ChildContent { get; set; }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt deleted file mode 100644 index ce3eb9c9b5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt +++ /dev/null @@ -1,29 +0,0 @@ -Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) -|foreach (var item2 in Items2) -{ -| -Generated Location: (679:19,1 [34] ) -|foreach (var item2 in Items2) -{ -| - -Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|} -| -Generated Location: (1111:33,0 [3] ) -|} -| - -Source Location: (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) -| - [Parameter] TItem1 Item1 { get; set; } - [Parameter] List Items2 { get; set; } - [Parameter] RenderFragment ChildContent { get; set; } -| -Generated Location: (1258:40,12 [164] ) -| - [Parameter] TItem1 Item1 { get; set; } - [Parameter] List Items2 { get; set; } - [Parameter] RenderFragment ChildContent { get; set; } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs deleted file mode 100644 index 1a8e86cab4..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs +++ /dev/null @@ -1,22 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddMarkupContent(0, "
    \n
    "); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt deleted file mode 100644 index 52917e45c3..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt +++ /dev/null @@ -1,12 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlBlock - -
    \n
    diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs deleted file mode 100644 index d3fc981a86..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "ParamBefore", "before"); - builder.AddAttribute(2, "ParamAfter", "after"); - builder.AddComponentReferenceCapture(3, (__value) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - myInstance = (Test.MyComponent)__value; - -#line default -#line hidden - } - ); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt deleted file mode 100644 index c79c0afd23..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [72] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - - ParamBefore - - HtmlContent - (57:1,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (57:1,26 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before - RefExtensionNode - (70:1,39 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance - Test.MyComponent - ComponentAttributeExtensionNode - - ParamAfter - - HtmlContent - (94:1,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (94:1,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after - CSharpCode - (119:3,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (119:3,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Test.MyComponent myInstance;\n public void Foo() { System.GC.KeepAlive(myInstance); }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt deleted file mode 100644 index ea8d5c6853..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt +++ /dev/null @@ -1,16 +0,0 @@ -Source Location: (70:1,39 [10] x:\dir\subdir\Test\TestComponent.cshtml) -|myInstance| -Generated Location: (888:21,39 [10] ) -|myInstance| - -Source Location: (119:3,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } -| -Generated Location: (1142:31,12 [104] ) -| - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs deleted file mode 100644 index 60c7ebc335..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,44 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "SomeProp", "val"); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - builder2.AddContent(3, "\n Some "); - builder2.AddMarkupContent(4, "further content\n"); - } - )); - builder.AddComponentReferenceCapture(5, (__value) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - myInstance = (Test.MyComponent)__value; - -#line default -#line hidden - } - ); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 6 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt deleted file mode 100644 index 8407ec8378..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [96] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (76:1,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (76:1,45 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n Some - HtmlBlock - - further content\n - RefExtensionNode - (49:1,18 [10] x:\dir\subdir\Test\TestComponent.cshtml) - myInstance - Test.MyComponent - ComponentAttributeExtensionNode - - SomeProp - - HtmlContent - (71:1,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (71:1,40 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - val - CSharpCode - (143:5,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (143:5,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Test.MyComponent myInstance;\n public void Foo() { System.GC.KeepAlive(myInstance); }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt deleted file mode 100644 index 9dbf41a99d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt +++ /dev/null @@ -1,16 +0,0 @@ -Source Location: (49:1,18 [10] x:\dir\subdir\Test\TestComponent.cshtml) -|myInstance| -Generated Location: (1083:26,18 [10] ) -|myInstance| - -Source Location: (143:5,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } -| -Generated Location: (1337:36,12 [104] ) -| - private Test.MyComponent myInstance; - public void Foo() { System.GC.KeepAlive(myInstance); } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs deleted file mode 100644 index 076c244509..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "elem"); - builder.AddAttribute(1, "attributebefore", "before"); - builder.AddAttribute(2, "attributeafter", "after"); - builder.AddElementReferenceCapture(3, (__value) => { -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - myElem = __value; - -#line default -#line hidden - } - ); - builder.AddContent(4, "Hello"); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Microsoft.AspNetCore.Components.ElementRef myElem; - public void Foo() { System.GC.KeepAlive(myElem); } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt deleted file mode 100644 index 3becd3940c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt +++ /dev/null @@ -1,23 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [79] x:\dir\subdir\Test\TestComponent.cshtml) - elem - HtmlContent - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello - HtmlAttribute - - attributebefore=" - " - HtmlAttributeValue - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (23:0,23 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - before - RefExtensionNode - (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) - myElem - Element - HtmlAttribute - - attributeafter=" - " - HtmlAttributeValue - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after - CSharpCode - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Microsoft.AspNetCore.Components.ElementRef myElem;\n public void Foo() { System.GC.KeepAlive(myElem); }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt deleted file mode 100644 index 71cbebbe5e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt +++ /dev/null @@ -1,16 +0,0 @@ -Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|myElem| -Generated Location: (879:21,36 [6] ) -|myElem| - -Source Location: (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Microsoft.AspNetCore.Components.ElementRef myElem; - public void Foo() { System.GC.KeepAlive(myElem); } -| -Generated Location: (1154:32,12 [122] ) -| - private Microsoft.AspNetCore.Components.ElementRef myElem; - public void Foo() { System.GC.KeepAlive(myElem); } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs deleted file mode 100644 index daf7ed1d8e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onfocus", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("alert(\"Test\");")); - builder.CloseElement(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt deleted file mode 100644 index 3d504c06f9..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - - CSharp - "alert(\"Test\");" - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs deleted file mode 100644 index 8d291c9a04..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - void OnClick(UIEventArgs e) { - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt deleted file mode 100644 index db06c4f0ea..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - CSharpCode - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n void OnClick(UIEventArgs e) {\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt deleted file mode 100644 index 35125aed42..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt +++ /dev/null @@ -1,11 +0,0 @@ -Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) -| - void OnClick(UIEventArgs e) { - } -| -Generated Location: (918:22,12 [44] ) -| - void OnClick(UIEventArgs e) { - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs deleted file mode 100644 index 0848a804f7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - void OnClick(UIMouseEventArgs e) { - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt deleted file mode 100644 index 1d316a8f81..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n void OnClick(UIMouseEventArgs e) {\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt deleted file mode 100644 index 165e27a701..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt +++ /dev/null @@ -1,11 +0,0 @@ -Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) -| - void OnClick(UIMouseEventArgs e) { - } -| -Generated Location: (918:22,12 [49] ) -| - void OnClick(UIMouseEventArgs e) { - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs deleted file mode 100644 index 53546b8292..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(x => { })); - builder.CloseElement(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt deleted file mode 100644 index 6330618eda..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { } - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs deleted file mode 100644 index 0848a804f7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - void OnClick(UIMouseEventArgs e) { - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt deleted file mode 100644 index 1d316a8f81..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n void OnClick(UIMouseEventArgs e) {\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt deleted file mode 100644 index 165e27a701..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt +++ /dev/null @@ -1,11 +0,0 @@ -Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) -| - void OnClick(UIMouseEventArgs e) { - } -| -Generated Location: (918:22,12 [49] ) -| - void OnClick(UIMouseEventArgs e) { - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs deleted file mode 100644 index 53546b8292..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(x => { })); - builder.CloseElement(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt deleted file mode 100644 index 6330618eda..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { } - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs deleted file mode 100644 index 83bd39591f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - void OnClick() { - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt deleted file mode 100644 index cac45e6297..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick - IntermediateToken - - CSharp - ) - CSharpCode - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n void OnClick() {\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt deleted file mode 100644 index c009c34e8c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt +++ /dev/null @@ -1,11 +0,0 @@ -Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) -| - void OnClick() { - } -| -Generated Location: (918:22,12 [31] ) -| - void OnClick() { - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs deleted file mode 100644 index 160ee3f277..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(() => { })); - builder.CloseElement(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt deleted file mode 100644 index 64b7520723..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { } - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs deleted file mode 100644 index b548a04645..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("foo")); - builder.CloseElement(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt deleted file mode 100644 index dfdc050a28..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input - HtmlAttribute - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - - CSharp - "foo" - IntermediateToken - - CSharp - ) diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs deleted file mode 100644 index 006b008784..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(3)); - builder.AddComponentReferenceCapture(2, (__value) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - _my = (Test.MyComponent)__value; - -#line default -#line hidden - } - ); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt deleted file mode 100644 index 32c963b7f4..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt +++ /dev/null @@ -1,19 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentTypeArgumentExtensionNode - (50:1,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - TItem - IntermediateToken - (50:1,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - int - ComponentAttributeExtensionNode - (60:1,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - IntermediateToken - (60:1,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3 - RefExtensionNode - (68:1,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my - Test.MyComponent - CSharpCode - (91:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (91:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private MyComponent _my;\n public void Foo() { System.GC.KeepAlive(_my); }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt deleted file mode 100644 index 527982b014..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt +++ /dev/null @@ -1,16 +0,0 @@ -Source Location: (68:1,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|_my| -Generated Location: (879:20,37 [3] ) -|_my| - -Source Location: (91:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) -| - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } -| -Generated Location: (1131:30,12 [90] ) -| - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs deleted file mode 100644 index c299061cdb..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 3, 2, (__value) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - _my = __value; - -#line default -#line hidden - } - ); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } - -#line default -#line hidden - } -} -namespace __Blazor.Test.TestComponent -{ - #line hidden - internal static class TypeInference - { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action> __arg1) - { - builder.OpenComponent>(seq); - builder.AddAttribute(__seq0, "Item", __arg0); - builder.AddComponentReferenceCapture(__seq1, (__value) => { __arg1((global::Test.MyComponent)__value); }); - builder.CloseComponent(); - } - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt deleted file mode 100644 index ec12816d5c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent - ComponentAttributeExtensionNode - (50:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - IntermediateToken - (50:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 3 - RefExtensionNode - (58:1,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) - _my - global::Test.MyComponent - CSharpCode - (81:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (81:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private MyComponent _my;\n public void Foo() { System.GC.KeepAlive(_my); }\n - NamespaceDeclaration - - __Blazor.Test.TestComponent - ClassDeclaration - - internal static - TypeInference - - - ComponentTypeInferenceMethod - - __Blazor.Test.TestComponent.TypeInference - CreateMyComponent_0 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt deleted file mode 100644 index 5803b4379d..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt +++ /dev/null @@ -1,16 +0,0 @@ -Source Location: (58:1,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|_my| -Generated Location: (738:18,27 [3] ) -|_my| - -Source Location: (81:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) -| - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } -| -Generated Location: (928:27,12 [90] ) -| - private MyComponent _my; - public void Foo() { System.GC.KeepAlive(_my); } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs deleted file mode 100644 index 7dfa3b3021..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddContent(0, "My value"); - builder.AddContent(1, "\n\n"); - builder.AddMarkupContent(2, "

    Hello

    "); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt deleted file mode 100644 index 7b9697cfba..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt +++ /dev/null @@ -1,16 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpExpression - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "My value" - HtmlContent - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlBlock - -

    Hello

    diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs deleted file mode 100644 index 4df487e6d7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs +++ /dev/null @@ -1,25 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.CloseComponent(); - builder.AddContent(1, "\n\n"); - builder.AddMarkupContent(2, "

    Hello

    "); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt deleted file mode 100644 index 6f9090488c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt +++ /dev/null @@ -1,15 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (36:2,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent - Test.SomeOtherComponent - HtmlContent - (58:2,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:2,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlBlock - -

    Hello

    diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs deleted file mode 100644 index 02d3036e76..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs +++ /dev/null @@ -1,22 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - using System; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddMarkupContent(0, "

    Hello

    "); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt deleted file mode 100644 index 210b13ae3f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt +++ /dev/null @@ -1,12 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - UsingDirective - (1:0,1 [14] x:\dir\subdir\Test\TestComponent.cshtml) - System - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlBlock - -

    Hello

    diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs deleted file mode 100644 index 6032dbfa1e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - builder2.AddContent(2, "Hi!"); - } - )); - builder.AddAttribute(3, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - builder2.AddContent(4, "bye!"); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt deleted file mode 100644 index ad902f45bf..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt +++ /dev/null @@ -1,18 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - (50:2,4 [20] x:\dir\subdir\Test\TestComponent.cshtml) - Header - HtmlContent - (58:2,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:2,12 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hi! - ComponentChildContent - (76:3,4 [26] x:\dir\subdir\Test\TestComponent.cshtml) - Footer - CSharpExpression - (86:3,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (86:3,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "bye!" diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs deleted file mode 100644 index 8068fdf5de..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs +++ /dev/null @@ -1,42 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment template = (context) => - -#line default -#line hidden - (builder2) => { - builder2.OpenElement(0, "li"); - builder2.AddContent(1, "#"); - builder2.AddContent(2, context.Index); - builder2.AddContent(3, " - "); - builder2.AddContent(4, context.Item.ToLower()); - builder2.CloseElement(); - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - builder.OpenComponent(5); - builder.AddAttribute(6, "Template", new Microsoft.AspNetCore.Components.RenderFragment(template)); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt deleted file mode 100644 index e7d96bc27c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (35:1,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment template = (context) => - Template - (90:1,57 [48] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (90:1,57 [50] x:\dir\subdir\Test\TestComponent.cshtml) - li - HtmlContent - (94:1,61 [1] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (94:1,61 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - # - CSharpExpression - (96:1,63 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (96:1,63 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Index - HtmlContent - (109:1,76 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (109:1,76 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \- - CSharpExpression - (113:1,80 [22] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (113:1,80 [22] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Item.ToLower() - CSharpCode - (140:1,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (140:1,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (145:2,0 [35] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (168:2,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Template - Template - CSharpExpression - (169:2,24 [8] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (169:2,24 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt deleted file mode 100644 index 1963f1cf2c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (35:1,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment template = (context) => | -Generated Location: (602:17,2 [54] ) -| RenderFragment template = (context) => | - -Source Location: (140:1,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (1196:30,107 [2] ) -|; | - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs deleted file mode 100644 index cbf409e585..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - RenderFragment p = (person) => - -#line default -#line hidden - (builder2) => { - builder2.OpenElement(0, "div"); - builder2.OpenComponent(1); - builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(person.Name)); - builder2.CloseComponent(); - builder2.CloseElement(); - } -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 5 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt deleted file mode 100644 index c7f75745ba..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt +++ /dev/null @@ -1,23 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n RenderFragment p = (person) => - Template - (81:2,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (81:2,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div - ComponentExtensionNode - (86:2,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (105:2,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - Name - CSharpExpression - (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - CSharpCode - (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n - CSharpCode - (144:4,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (144:4,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt deleted file mode 100644 index acde1a8af7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt +++ /dev/null @@ -1,29 +0,0 @@ -Source Location: (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) -| - RenderFragment p = (person) => | -Generated Location: (602:17,2 [45] ) -| - RenderFragment p = (person) => | - -Source Location: (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|; -| -Generated Location: (1198:30,89 [3] ) -|; -| - -Source Location: (144:4,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } -| -Generated Location: (1344:37,12 [76] ) -| - class Person - { - public string Name { get; set; } - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs deleted file mode 100644 index 75cf31b314..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs +++ /dev/null @@ -1,56 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - RenderFragment p = (person) => - -#line default -#line hidden - (builder2) => { - builder2.OpenElement(0, "div"); - builder2.OpenComponent(1); - builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(person.Name)); - builder2.CloseComponent(); - builder2.CloseElement(); - } -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - builder.OpenComponent(3); - builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { - builder2.AddContent(5, "\n"); - builder2.AddContent(6, "hello, world!"); - builder2.AddContent(7, "\n"); - } - )); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 9 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt deleted file mode 100644 index 0ec2d91086..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n RenderFragment p = (person) => - Template - (81:2,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (81:2,44 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div - ComponentExtensionNode - (86:2,49 [34] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (105:2,68 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Name - Name - CSharpExpression - (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - CSharpCode - (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n - ComponentExtensionNode - (132:4,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentChildContent - - ChildContent - HtmlContent - (145:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (145:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpExpression - (149:5,2 [15] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (149:5,2 [15] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hello, world!" - HtmlContent - (165:5,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (165:5,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (197:8,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (197:8,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt deleted file mode 100644 index c0db477d8a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt +++ /dev/null @@ -1,29 +0,0 @@ -Source Location: (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) -| - RenderFragment p = (person) => | -Generated Location: (602:17,2 [45] ) -| - RenderFragment p = (person) => | - -Source Location: (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|; -| -Generated Location: (1198:30,89 [3] ) -|; -| - -Source Location: (197:8,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } -| -Generated Location: (1742:45,12 [76] ) -| - class Person - { - public string Name { get; set; } - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs deleted file mode 100644 index dcb427879a..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment template = (person) => - -#line default -#line hidden - (builder2) => { - builder2.OpenElement(0, "div"); - builder2.AddContent(1, person.Name); - builder2.CloseElement(); - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - builder.OpenComponent(2); - builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Components.RenderFragment(template)); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt deleted file mode 100644 index 0d9aff443e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt +++ /dev/null @@ -1,23 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (35:1,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment template = (person) => - Template - (83:1,50 [22] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (83:1,50 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (89:1,56 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (89:1,56 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - CSharpCode - (106:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (106:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (111:2,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (140:2,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) - PersonTemplate - PersonTemplate - CSharpExpression - (141:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (141:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt deleted file mode 100644 index ef5720700b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (35:1,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment template = (person) => | -Generated Location: (602:17,2 [47] ) -| RenderFragment template = (person) => | - -Source Location: (106:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (995:27,73 [2] ) -|; | - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs deleted file mode 100644 index a0fa8858ce..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,38 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddContent(0, RenderPerson((person) => (builder2) => { - builder2.OpenElement(1, "div"); - builder2.AddContent(2, person.Name); - builder2.CloseElement(); - } - )); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt deleted file mode 100644 index 37914cc732..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpExpression - (1:0,1 [48] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => - Template - (27:0,27 [22] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (27:0,27 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - IntermediateToken - (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ) - CSharpCode - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n\n object RenderPerson(RenderFragment p) => null;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt deleted file mode 100644 index 998fa7c231..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| -Generated Location: (914:25,12 [138] ) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs deleted file mode 100644 index 333bd6f5d5..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs +++ /dev/null @@ -1,46 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - - RenderFragment p = (person) => - -#line default -#line hidden - (builder2) => { - builder2.OpenElement(0, "div"); - builder2.AddContent(1, person.Name); - builder2.CloseElement(); - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt deleted file mode 100644 index 5a22540dc7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n RenderFragment p = (person) => - Template - (48:1,44 [22] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (48:1,44 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - CSharpCode - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n - CSharpCode - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt deleted file mode 100644 index fa40ec8015..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt +++ /dev/null @@ -1,29 +0,0 @@ -Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) -| - RenderFragment p = (person) => | -Generated Location: (602:17,2 [45] ) -| - RenderFragment p = (person) => | - -Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|; -| -Generated Location: (987:28,67 [3] ) -|; -| - -Source Location: (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } -| -Generated Location: (1133:35,12 [76] ) -| - class Person - { - public string Name { get; set; } - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs deleted file mode 100644 index a0fa8858ce..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,38 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddContent(0, RenderPerson((person) => (builder2) => { - builder2.OpenElement(1, "div"); - builder2.AddContent(2, person.Name); - builder2.CloseElement(); - } - )); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt deleted file mode 100644 index 8273aafc57..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpExpression - (2:0,2 [48] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson((person) => - Template - (28:0,28 [22] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (28:0,28 [23] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - person.Name - IntermediateToken - (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ) - CSharpCode - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n\n object RenderPerson(RenderFragment p) => null;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt deleted file mode 100644 index fd453a55c6..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| -Generated Location: (914:25,12 [138] ) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs deleted file mode 100644 index 714746db4e..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs +++ /dev/null @@ -1,37 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment template = - -#line default -#line hidden - (builder2) => { - builder2.AddMarkupContent(0, "
    Joey
    "); - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - builder.OpenComponent(1); - builder.AddAttribute(2, "Person", template); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt deleted file mode 100644 index bce4cf0b18..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (35:1,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment template = - Template - (63:1,30 [15] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlBlock - -
    Joey
    - CSharpCode - (78:1,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (78:1,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (83:2,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - - Person - - CSharpExpression - (104:2,21 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (105:2,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt deleted file mode 100644 index 768ce896f0..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (35:1,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment template = | -Generated Location: (602:17,2 [27] ) -| RenderFragment template = | - -Source Location: (78:1,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (868:25,45 [2] ) -|; | - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs deleted file mode 100644 index 19de0ad213..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddContent(0, RenderPerson((builder2) => { - builder2.AddMarkupContent(1, "
    HI
    "); - } - )); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - object RenderPerson(RenderFragment p) => null; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt deleted file mode 100644 index 0c92c8d333..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt +++ /dev/null @@ -1,18 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpExpression - (1:0,1 [27] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson( - Template - (15:0,15 [13] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlBlock - -
    HI
    - IntermediateToken - (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ) - CSharpCode - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n object RenderPerson(RenderFragment p) => null;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt deleted file mode 100644 index 75ad368ca8..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) -| - object RenderPerson(RenderFragment p) => null; -| -Generated Location: (821:23,12 [54] ) -| - object RenderPerson(RenderFragment p) => null; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs deleted file mode 100644 index de8ea8d353..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs +++ /dev/null @@ -1,31 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "v", Microsoft.AspNetCore.Components.BindMethods.GetValue(y)); - builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => y = __value, y)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - string y = null; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt deleted file mode 100644 index 3d82670555..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - Counter - Test.Counter - ComponentAttributeExtensionNode - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => y = __value, y) - CSharpCode - (67:2,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (67:2,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string y = null;\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt deleted file mode 100644 index 727b6af35f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Source Location: (67:2,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) -| - string y = null; -| -Generated Location: (991:23,12 [24] ) -| - string y = null; -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs deleted file mode 100644 index 8c117e539f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs +++ /dev/null @@ -1,34 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenComponent(0); - builder.AddAttribute(1, "Name", Microsoft.AspNetCore.Components.BindMethods.GetValue(UserName)); - builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName)); - builder.AddAttribute(3, "IsActive", Microsoft.AspNetCore.Components.BindMethods.GetValue(UserIsActive)); - builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive)); - builder.CloseComponent(); - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - public string UserName { get; set; } - public bool UserIsActive { get; set; } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt deleted file mode 100644 index 7723e3e565..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt +++ /dev/null @@ -1,30 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - ComponentExtensionNode - (31:1,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - User - Test.User - ComponentAttributeExtensionNode - (48:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (49:1,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (48:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName) - ComponentAttributeExtensionNode - (74:1,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( - IntermediateToken - (75:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive - IntermediateToken - - CSharp - ) - ComponentAttributeExtensionNode - (74:1,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive) - CSharpCode - (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string UserName { get; set; }\n public bool UserIsActive { get; set; }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt deleted file mode 100644 index 77ef4f484c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt +++ /dev/null @@ -1,11 +0,0 @@ -Source Location: (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) -| - public string UserName { get; set; } - public bool UserIsActive { get; set; } -| -Generated Location: (1300:25,12 [88] ) -| - public string UserName { get; set; } - public bool UserIsActive { get; set; } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs deleted file mode 100644 index 2ce16627be..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs +++ /dev/null @@ -1,26 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - [Microsoft.AspNetCore.Components.RouteAttribute("/")] - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddMarkupContent(0, "

    Hello, world!

    \n\nWelcome to your new app.\n\n"); - builder.OpenComponent(1); - builder.AddAttribute(2, "Title", ""); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt deleted file mode 100644 index 57b2bc7949..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.diagnostics.txt +++ /dev/null @@ -1,2 +0,0 @@ -x:\dir\subdir\Test\TestComponent.cshtml(8,2): Error RZ1035: Missing close angle for tag helper 'SurveyPrompt'. -x:\dir\subdir\Test\TestComponent.cshtml(8,2): Error RZ1034: Found a malformed 'SurveyPrompt' tag helper. Tag helpers must have a start and end tag or be self closing. diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt deleted file mode 100644 index b127a13de4..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - RouteAttributeExtensionNode - - / - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlBlock - -

    Hello, world!

    \n\nWelcome to your new app.\n\n - ComponentExtensionNode - (98:7,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt - Test.SurveyPrompt - ComponentAttributeExtensionNode - (119:7,21 [0] x:\dir\subdir\Test\TestComponent.cshtml) - Title - Title - HtmlContent - (119:7,21 [0] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (119:7,21 [0] x:\dir\subdir\Test\TestComponent.cshtml) - Html - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs deleted file mode 100644 index a75a64a1e6..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs +++ /dev/null @@ -1,26 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - [Microsoft.AspNetCore.Components.RouteAttribute("/")] - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddMarkupContent(0, "

    Hello, world!

    \n\nWelcome to your new app.\n\n"); - builder.OpenComponent(1); - builder.AddAttribute(2, "Title", "
    Test!
    "); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt deleted file mode 100644 index 1fb9a8886b..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - RouteAttributeExtensionNode - - / - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlBlock - -

    Hello, world!

    \n\nWelcome to your new app.\n\n - ComponentExtensionNode - (98:7,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - SurveyPrompt - Test.SurveyPrompt - ComponentAttributeExtensionNode - (119:7,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Title - Title - HtmlContent - (119:7,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (119:7,21 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html -
    Test!
    diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs deleted file mode 100644 index 1132f45145..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "p"); - builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnComponentHover)); - builder.AddAttribute(2, "style", "background:" + " " + (ParentBgColor) + ";"); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - public string ParentBgColor { get; set; } = "#FFFFFF"; - - public void OnComponentHover(UIMouseEventArgs e) - { - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt deleted file mode 100644 index 4a5b1e1c63..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt +++ /dev/null @@ -1,26 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p - HtmlAttribute - (16:0,16 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - " - CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( - IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover - IntermediateToken - - CSharp - ) - HtmlAttribute - - style=" - " - HtmlAttributeValue - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (42:0,42 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Html - background: - CSharpExpressionAttributeValue - (53:0,53 [15] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentBgColor - HtmlAttributeValue - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (68:0,68 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ; - CSharpCode - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string ParentBgColor { get; set; } = "#FFFFFF";\n\n public void OnComponentHover(UIMouseEventArgs e)\n {\n }\n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt deleted file mode 100644 index c9f709e2c1..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt +++ /dev/null @@ -1,17 +0,0 @@ -Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) -| - public string ParentBgColor { get; set; } = "#FFFFFF"; - - public void OnComponentHover(UIMouseEventArgs e) - { - } -| -Generated Location: (1019:23,12 [132] ) -| - public string ParentBgColor { get; set; } = "#FFFFFF"; - - public void OnComponentHover(UIMouseEventArgs e) - { - } -| - diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs deleted file mode 100644 index 4a3c1c6225..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs +++ /dev/null @@ -1,30 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "div"); - builder.AddContent(1, "\n "); - builder.OpenElement(2, "script"); - builder.AddAttribute(3, "src", "some/url.js"); - builder.AddAttribute(4, "anotherattribute", ""); - builder.AddContent(5, "\n some text\n some more text\n "); - builder.CloseElement(); - builder.AddContent(6, "\n"); - builder.CloseElement(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt deleted file mode 100644 index e96a9b8477..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt +++ /dev/null @@ -1,25 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [144] x:\dir\subdir\Test\TestComponent.cshtml) - div - HtmlContent - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (11:1,4 [125] x:\dir\subdir\Test\TestComponent.cshtml) - script - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - some/url.js - HtmlAttribute - - - - HtmlAttributeValue - - - IntermediateToken - - Html - - HtmlContent - (78:1,71 [49] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (78:1,71 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n some text\n some more text\n - HtmlContent - (136:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (136:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs deleted file mode 100644 index 9b8920ec7c..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,23 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddMarkupContent(0, "

    Hello

    \n\n"); - builder.AddContent(1, "My value"); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt deleted file mode 100644 index e11585d5f6..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt +++ /dev/null @@ -1,14 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlBlock - -

    Hello

    \n\n - CSharpExpression - (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "My value" diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs deleted file mode 100644 index 3f04a5e7e6..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddMarkupContent(0, "

    Hello

    \n\n"); - builder.OpenComponent(1); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt deleted file mode 100644 index 9c3a0c453f..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt +++ /dev/null @@ -1,13 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlBlock - -

    Hello

    \n\n - ComponentExtensionNode - (49:3,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent - Test.SomeOtherComponent diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs deleted file mode 100644 index 9c401bc703..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs +++ /dev/null @@ -1,23 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Components; - [Microsoft.AspNetCore.Components.RouteAttribute("/my/url")] - public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddMarkupContent(0, "

    Hello

    "); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt deleted file mode 100644 index 01e9d759a7..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt +++ /dev/null @@ -1,13 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components - RouteAttributeExtensionNode - - /my/url - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlBlock - -

    Hello

    From d52672748ace8046fb2bcdcec6320bd016d16500 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 31 Dec 2018 15:46:01 -0800 Subject: [PATCH 44/80] Do not throw when a status code with a codefix appears multiple times in the method body Fixes https://github.com/aspnet/AspNetCore/issues/4480 --- .../AddResponseTypeAttributeCodeFixAction.cs | 7 +++- ...AttributeCodeFixProviderIntegrationTest.cs | 3 ++ ...pleIdenticalStatusCodesAreInError.Input.cs | 34 +++++++++++++++++ ...leIdenticalStatusCodesAreInError.Output.cs | 38 +++++++++++++++++++ 4 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Input.cs create mode 100644 src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Output.cs diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixAction.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixAction.cs index e7601b6b7f..d138d6afb1 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixAction.cs +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixAction.cs @@ -169,7 +169,12 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers } var statusCode = metadata.IsDefaultResponse ? 200 : metadata.StatusCode; - statusCodes.Add(statusCode, (statusCode, metadata.ReturnType)); + if (!statusCodes.ContainsKey(statusCode)) + { + // If a status code appears multiple times in the actual metadata, pick the first one to + // appear in the codefix + statusCodes.Add(statusCode, (statusCode, metadata.ReturnType)); + } } return statusCodes.Values; diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs index f0cfbff1e5..9ba677d101 100644 --- a/src/Mvc/test/Mvc.Api.Analyzers.Test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs +++ b/src/Mvc/test/Mvc.Api.Analyzers.Test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs @@ -51,6 +51,9 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers [Fact] public Task CodeFixAddsStatusCodesFromObjectInitializer() => RunTest(); + [Fact] + public Task CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError() => RunTest(); + private async Task RunTest([CallerMemberName] string testMethod = "") { // Arrange diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Input.cs new file mode 100644 index 0000000000..19d51ee710 --- /dev/null +++ b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Input.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Linq; + +namespace Microsoft.AspNetCore.Mvc.Api.Analyzers._INPUT_ +{ + [ApiController] + [Route("[controller]/[action]")] + public class CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError : ControllerBase + { + public List Values { get; } = + new List(); + + public ActionResult GetItem(int id) + { + if (id == 0) + { + return NotFound(); + } + + var model = Values.FirstOrDefault(m => m.Id == id); + if (model == null) + { + return NotFound(); + } + + return model; + } + } + + public class CodeFixWorksWhenMultipleIdenticalStatusCodesAreInErrorModel + { + public int Id { get; set; } + } +} diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Output.cs new file mode 100644 index 0000000000..cd7b5dad58 --- /dev/null +++ b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError.Output.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; +using System.Linq; +using Microsoft.AspNetCore.Http; + +namespace Microsoft.AspNetCore.Mvc.Api.Analyzers._OUTPUT_ +{ + [ApiController] + [Route("[controller]/[action]")] + public class CodeFixWorksWhenMultipleIdenticalStatusCodesAreInError : ControllerBase + { + public List Values { get; } = + new List(); + + [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + [ProducesDefaultResponseType] + public ActionResult GetItem(int id) + { + if (id == 0) + { + return NotFound(); + } + + var model = Values.FirstOrDefault(m => m.Id == id); + if (model == null) + { + return NotFound(); + } + + return model; + } + } + + public class CodeFixWorksWhenMultipleIdenticalStatusCodesAreInErrorModel + { + public int Id { get; set; } + } +} From d66537c7d12822c2c65905fda112e4c42dfca4cd Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 2 Jan 2019 09:56:39 -0800 Subject: [PATCH 45/80] Convert Azure hosting startup and integration projects to use ProjectRef (#6207) --- build/artifacts.props | 2 - build/buildorder.props | 1 - build/submodules.props | 2 - eng/Baseline.Designer.props | 113 ++++++-- eng/Baseline.xml | 9 +- eng/ProjectReferences.props | 3 + .../ApplicationInsightsLoggerStartupFilter.cs | 0 .../src}/ApplicationInsightsStartupLoader.cs | 0 .../JavaScriptSnippetTagHelperComponent.cs | 0 ....ApplicationInsights.HostingStartup.csproj | 22 ++ .../src}/baseline.netcore.json | 0 .../src}/baseline.netframework.json | 0 .../test/UnitTests}/AfterScript.html | 0 .../test/UnitTests}/BeforeScript.html | 0 .../test/UnitTests}/FunctionalTest.cs | 6 +- .../test/UnitTests}/JavaScriptSnippetTest.cs | 0 .../test/UnitTests}/LoggingTest.cs | 0 ...ationInsights.HostingStartup.Tests.csproj} | 9 +- .../UnitTests}/Properties/AssemblyInfo.cs | 0 .../test/UnitTests}/Rendered.html | 0 .../test/UnitTests}/Validator.cs | 0 ...icationInsightsHostingStartupSample.csproj | 20 ++ .../Controllers/HomeController.cs | 0 .../CurrentResponseTelemetryChannel.cs | 0 .../Startup.cs | 0 .../Views/Home/ScriptCheck.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../appsettings.Development.json | 0 .../appsettings.json | 0 .../ApplicationInsights.settings.json | 0 src/Azure/Azure.sln | 87 ++++++ .../src}/AssemblyInfo.cs | 0 .../src}/AzureAppServicesHostingStartup.cs | 0 .../HostingStartupConfigurationExtensions.cs | 0 ...ore.AzureAppServices.HostingStartup.csproj | 9 +- .../src}/baseline.netcore.json | 0 .../src}/baseline.netframework.json | 0 .../AppServicesWebHostBuilderExtensions.cs | 0 ...NetCore.AzureAppServicesIntegration.csproj | 4 +- .../src}/Properties/AssemblyInfo.cs | 0 .../src}/baseline.netcore.json | 0 ...AppServicesWebHostBuilderExtensionsTest.cs | 0 ...e.AzureAppServicesIntegration.Tests.csproj | 13 + .../build => Azure}/hostingstartup.targets | 0 ...zureAppServicesHostingStartupSample.csproj | 15 ++ .../Startup.cs | 0 .../AzureAppServicesSample.csproj | 15 ++ .../AzureAppServicesSample/Startup.cs | 0 src/AzureIntegration/AzureIntegration.sln | 72 ----- ...icationInsightsHostingStartupSample.csproj | 24 -- .../Properties/launchSettings.json | 29 -- ...zureAppServicesHostingStartupSample.csproj | 18 -- .../Properties/launchSettings.json | 24 -- .../AzureAppServicesSample.csproj | 18 -- .../Properties/launchSettings.json | 24 -- ....ApplicationInsights.HostingStartup.csproj | 22 -- .../AppModelDetectionResult.cs | 12 - .../AppModelDetector.cs | 250 ------------------ ...xtensions.ApplicationModelDetection.csproj | 15 -- .../RuntimeFramework.cs | 12 - .../baseline.netcore.json | 144 ---------- ...e.AzureAppServicesIntegration.Tests.csproj | 16 -- .../AppModelTests.cs | 229 ---------------- ...ons.ApplicationModelDetection.Tests.csproj | 12 - 66 files changed, 276 insertions(+), 975 deletions(-) rename src/{AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup => Azure/ApplicationInsights.HostingStartup/src}/ApplicationInsightsLoggerStartupFilter.cs (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup => Azure/ApplicationInsights.HostingStartup/src}/ApplicationInsightsStartupLoader.cs (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup => Azure/ApplicationInsights.HostingStartup/src}/JavaScriptSnippetTagHelperComponent.cs (100%) create mode 100644 src/Azure/ApplicationInsights.HostingStartup/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj rename src/{AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup => Azure/ApplicationInsights.HostingStartup/src}/baseline.netcore.json (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup => Azure/ApplicationInsights.HostingStartup/src}/baseline.netframework.json (100%) rename src/{AzureIntegration/test/ApplicationInsights.HostingStartup.Tests => Azure/ApplicationInsights.HostingStartup/test/UnitTests}/AfterScript.html (100%) rename src/{AzureIntegration/test/ApplicationInsights.HostingStartup.Tests => Azure/ApplicationInsights.HostingStartup/test/UnitTests}/BeforeScript.html (100%) rename src/{AzureIntegration/test/ApplicationInsights.HostingStartup.Tests => Azure/ApplicationInsights.HostingStartup/test/UnitTests}/FunctionalTest.cs (94%) rename src/{AzureIntegration/test/ApplicationInsights.HostingStartup.Tests => Azure/ApplicationInsights.HostingStartup/test/UnitTests}/JavaScriptSnippetTest.cs (100%) rename src/{AzureIntegration/test/ApplicationInsights.HostingStartup.Tests => Azure/ApplicationInsights.HostingStartup/test/UnitTests}/LoggingTest.cs (100%) rename src/{AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/ApplicationInsights.HostingStartup.Tests.csproj => Azure/ApplicationInsights.HostingStartup/test/UnitTests/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests.csproj} (51%) rename src/{AzureIntegration/test/ApplicationInsights.HostingStartup.Tests => Azure/ApplicationInsights.HostingStartup/test/UnitTests}/Properties/AssemblyInfo.cs (100%) rename src/{AzureIntegration/test/ApplicationInsights.HostingStartup.Tests => Azure/ApplicationInsights.HostingStartup/test/UnitTests}/Rendered.html (100%) rename src/{AzureIntegration/test/ApplicationInsights.HostingStartup.Tests => Azure/ApplicationInsights.HostingStartup/test/UnitTests}/Validator.cs (100%) create mode 100644 src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj rename src/{AzureIntegration/sample => Azure/ApplicationInsights.HostingStartup/test/testassets}/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs (100%) rename src/{AzureIntegration/sample => Azure/ApplicationInsights.HostingStartup/test/testassets}/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs (100%) rename src/{AzureIntegration/sample => Azure/ApplicationInsights.HostingStartup/test/testassets}/ApplicationInsightsHostingStartupSample/Startup.cs (100%) rename src/{AzureIntegration/sample => Azure/ApplicationInsights.HostingStartup/test/testassets}/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml (100%) rename src/{AzureIntegration/sample => Azure/ApplicationInsights.HostingStartup/test/testassets}/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml (100%) rename src/{AzureIntegration/sample => Azure/ApplicationInsights.HostingStartup/test/testassets}/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml (100%) rename src/{AzureIntegration/sample => Azure/ApplicationInsights.HostingStartup/test/testassets}/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml (100%) rename src/{AzureIntegration/sample => Azure/ApplicationInsights.HostingStartup/test/testassets}/ApplicationInsightsHostingStartupSample/appsettings.Development.json (100%) rename src/{AzureIntegration/sample => Azure/ApplicationInsights.HostingStartup/test/testassets}/ApplicationInsightsHostingStartupSample/appsettings.json (100%) rename src/{AzureIntegration/sample => Azure/ApplicationInsights.HostingStartup/test/testassets}/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup => Azure/AzureAppServices.HostingStartup/src}/AssemblyInfo.cs (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup => Azure/AzureAppServices.HostingStartup/src}/AzureAppServicesHostingStartup.cs (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup => Azure/AzureAppServices.HostingStartup/src}/HostingStartupConfigurationExtensions.cs (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup => Azure/AzureAppServices.HostingStartup/src}/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj (50%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup => Azure/AzureAppServices.HostingStartup/src}/baseline.netcore.json (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup => Azure/AzureAppServices.HostingStartup/src}/baseline.netframework.json (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration => Azure/AzureAppServicesIntegration/src}/AppServicesWebHostBuilderExtensions.cs (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration => Azure/AzureAppServicesIntegration/src}/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj (63%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration => Azure/AzureAppServicesIntegration/src}/Properties/AssemblyInfo.cs (100%) rename src/{AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration => Azure/AzureAppServicesIntegration/src}/baseline.netcore.json (100%) rename src/{AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests => Azure/AzureAppServicesIntegration/test}/AppServicesWebHostBuilderExtensionsTest.cs (100%) create mode 100644 src/Azure/AzureAppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj rename src/{AzureIntegration/build => Azure}/hostingstartup.targets (100%) create mode 100644 src/Azure/samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj rename src/{AzureIntegration/sample => Azure/samples}/AzureAppServicesHostingStartupSample/Startup.cs (100%) create mode 100644 src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj rename src/{AzureIntegration/sample => Azure/samples}/AzureAppServicesSample/Startup.cs (100%) delete mode 100644 src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj delete mode 100644 src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json delete mode 100644 src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj delete mode 100644 src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json delete mode 100644 src/AzureIntegration/sample/AzureAppServicesSample/AzureAppServicesSample.csproj delete mode 100644 src/AzureIntegration/sample/AzureAppServicesSample/Properties/launchSettings.json delete mode 100644 src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj delete mode 100644 src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetectionResult.cs delete mode 100644 src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetector.cs delete mode 100644 src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/Microsoft.Extensions.ApplicationModelDetection.csproj delete mode 100644 src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/RuntimeFramework.cs delete mode 100644 src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/baseline.netcore.json delete mode 100644 src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj delete mode 100644 src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/AppModelTests.cs delete mode 100644 src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/Microsoft.Extensions.ApplicationModelDetection.Tests.csproj diff --git a/build/artifacts.props b/build/artifacts.props index 8e693df702..05028ca8bb 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -160,7 +160,6 @@ - @@ -174,7 +173,6 @@ - diff --git a/build/buildorder.props b/build/buildorder.props index 47cc8e8f97..4e44ced9e1 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -10,7 +10,6 @@ - diff --git a/build/submodules.props b/build/submodules.props index c32ed63753..a7f9ba0e39 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -45,9 +45,7 @@ - - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index ed463e7dbb..7c4b8ae105 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -35,6 +35,37 @@ + + + 2.1.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.1.1 @@ -170,6 +201,30 @@ + + + 2.1.1 + + + + + + + + + + + + + + + + 2.1.1 + + + + + 2.1.3 @@ -422,16 +477,6 @@ - - - 2.1.6 - - - - - - - 2.1.6 @@ -463,6 +508,16 @@ + + + 2.1.6 + + + + + + + 2.1.1 @@ -968,25 +1023,6 @@ - - - 2.1.6 - - - - - - - - - - 2.1.6 - - - - - - 2.1.6 @@ -1024,6 +1060,25 @@ + + + 2.1.6 + + + + + + + + + + 2.1.6 + + + + + + 2.1.1 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 38fee0ed0c..01206c3926 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -10,6 +10,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + @@ -26,6 +27,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + + @@ -53,10 +56,10 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + @@ -105,10 +108,10 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - - + + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index bb3a234022..27a4004454 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -119,7 +119,10 @@ + + + diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsLoggerStartupFilter.cs b/src/Azure/ApplicationInsights.HostingStartup/src/ApplicationInsightsLoggerStartupFilter.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsLoggerStartupFilter.cs rename to src/Azure/ApplicationInsights.HostingStartup/src/ApplicationInsightsLoggerStartupFilter.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs b/src/Azure/ApplicationInsights.HostingStartup/src/ApplicationInsightsStartupLoader.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs rename to src/Azure/ApplicationInsights.HostingStartup/src/ApplicationInsightsStartupLoader.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/JavaScriptSnippetTagHelperComponent.cs b/src/Azure/ApplicationInsights.HostingStartup/src/JavaScriptSnippetTagHelperComponent.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/JavaScriptSnippetTagHelperComponent.cs rename to src/Azure/ApplicationInsights.HostingStartup/src/JavaScriptSnippetTagHelperComponent.cs diff --git a/src/Azure/ApplicationInsights.HostingStartup/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj b/src/Azure/ApplicationInsights.HostingStartup/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj new file mode 100644 index 0000000000..f70ddb284f --- /dev/null +++ b/src/Azure/ApplicationInsights.HostingStartup/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj @@ -0,0 +1,22 @@ + + + + + + ASP.NET Core lightup integration with Application Insights. + netcoreapp2.1;netcoreapp2.0;net461 + true + aspnetcore;ApplicationInsights;Analytics;Telemetry;AppInsights + + + + + + + + + + + + + diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netcore.json b/src/Azure/ApplicationInsights.HostingStartup/src/baseline.netcore.json similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netcore.json rename to src/Azure/ApplicationInsights.HostingStartup/src/baseline.netcore.json diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netframework.json b/src/Azure/ApplicationInsights.HostingStartup/src/baseline.netframework.json similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netframework.json rename to src/Azure/ApplicationInsights.HostingStartup/src/baseline.netframework.json diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/AfterScript.html b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/AfterScript.html similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/AfterScript.html rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/AfterScript.html diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/BeforeScript.html b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/BeforeScript.html similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/BeforeScript.html rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/BeforeScript.html diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/FunctionalTest.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/FunctionalTest.cs similarity index 94% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/FunctionalTest.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/FunctionalTest.cs index b3e5f175fb..ca784e1740 100644 --- a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/FunctionalTest.cs +++ b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/FunctionalTest.cs @@ -19,7 +19,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest var current = new DirectoryInfo(AppContext.BaseDirectory); while (current != null) { - if (File.Exists(Path.Combine(current.FullName, "AzureIntegration.sln"))) + if (File.Exists(Path.Combine(current.FullName, "Azure.sln"))) { break; } @@ -31,7 +31,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest throw new InvalidOperationException("Could not find the solution directory"); } - return Path.GetFullPath(Path.Combine(current.FullName, "sample", "ApplicationInsightsHostingStartupSample")); + return Path.GetFullPath(Path.Combine(current.FullName, "ApplicationInsights.HostingStartup", "test", "testassets", "ApplicationInsightsHostingStartupSample")); } protected static bool PreservePublishedApplicationForDebugging @@ -63,4 +63,4 @@ namespace ApplicationInsightsJavaScriptSnippetTest return configuration; } } -} \ No newline at end of file +} diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/JavaScriptSnippetTest.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/JavaScriptSnippetTest.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/LoggingTest.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/LoggingTest.cs similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/LoggingTest.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/LoggingTest.cs diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/ApplicationInsights.HostingStartup.Tests.csproj b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests.csproj similarity index 51% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/ApplicationInsights.HostingStartup.Tests.csproj rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests.csproj index 7926ac5ecd..97343abfcf 100644 --- a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/ApplicationInsights.HostingStartup.Tests.csproj +++ b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests.csproj @@ -17,12 +17,9 @@ - - - - - - + + + diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Properties/AssemblyInfo.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Properties/AssemblyInfo.cs similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Properties/AssemblyInfo.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Properties/AssemblyInfo.cs diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Rendered.html b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Rendered.html similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Rendered.html rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Rendered.html diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Validator.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Validator.cs similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Validator.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Validator.cs diff --git a/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj new file mode 100644 index 0000000000..7eab7f389e --- /dev/null +++ b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp2.1;netcoreapp2.0;net461 + win7-x86;win7-x64;linux-x64;osx-x64 + + + + + + + + + + + + + + + diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Startup.cs b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Startup.cs similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Startup.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Startup.cs diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/appsettings.Development.json b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/appsettings.Development.json similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/appsettings.Development.json rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/appsettings.Development.json diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/appsettings.json b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/appsettings.json similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/appsettings.json rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/appsettings.json diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln index 56ef0ae6f2..224a27d2cc 100644 --- a/src/Azure/Azure.sln +++ b/src/Azure/Azure.sln @@ -49,6 +49,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{9593691E-1B65-4EB1-97AA-F8B292B0082A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApplicationInsights.HostingStartup", "ApplicationInsights.HostingStartup", "{EE98F905-C0E0-4A09-8B0E-5F8728EB14CF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.ApplicationInsights.HostingStartup", "ApplicationInsights.HostingStartup\src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj", "{12544BE3-B7B9-42EA-A6BD-C354C9F39568}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9F1C63CA-BBE9-468A-B8E1-1C28A7D09F32}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{D9A5379C-EA5B-4AAE-8C84-46FAF40E4EEB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationInsightsHostingStartupSample", "ApplicationInsights.HostingStartup\test\testassets\ApplicationInsightsHostingStartupSample\ApplicationInsightsHostingStartupSample.csproj", "{B76BE944-681D-4887-9F90-5A24AD5924CB}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAppServices.HostingStartup", "AzureAppServices.HostingStartup", "{9EC158BE-EB9C-4627-931D-B1B95D3210B6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.AzureAppServices.HostingStartup", "AzureAppServices.HostingStartup\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj", "{4209F2B4-0388-47DF-A054-C974ABE78723}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAppServicesIntegration", "AzureAppServicesIntegration", "{C6E2B73F-137E-4C37-84DE-0863B1C30D23}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.AzureAppServicesIntegration", "AzureAppServicesIntegration\src\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj", "{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "AzureAppServicesIntegration\test\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj", "{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -251,6 +271,66 @@ Global {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x64.Build.0 = Release|Any CPU {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.ActiveCfg = Release|Any CPU {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.Build.0 = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x64.ActiveCfg = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x64.Build.0 = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x86.ActiveCfg = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x86.Build.0 = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|Any CPU.Build.0 = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x64.ActiveCfg = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x64.Build.0 = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x86.ActiveCfg = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x86.Build.0 = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x64.ActiveCfg = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x64.Build.0 = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x86.ActiveCfg = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x86.Build.0 = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|Any CPU.Build.0 = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x64.ActiveCfg = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x64.Build.0 = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x86.ActiveCfg = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x86.Build.0 = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x64.ActiveCfg = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x64.Build.0 = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x86.ActiveCfg = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x86.Build.0 = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|Any CPU.Build.0 = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x64.ActiveCfg = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x64.Build.0 = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x86.ActiveCfg = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x86.Build.0 = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|Any CPU.Build.0 = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x64.ActiveCfg = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x64.Build.0 = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x86.ActiveCfg = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x86.Build.0 = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|Any CPU.ActiveCfg = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|Any CPU.Build.0 = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x64.ActiveCfg = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x64.Build.0 = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x86.ActiveCfg = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x86.Build.0 = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x64.ActiveCfg = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x64.Build.0 = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x86.ActiveCfg = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x86.Build.0 = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|Any CPU.Build.0 = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x64.ActiveCfg = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x64.Build.0 = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x86.ActiveCfg = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -277,6 +357,13 @@ Global {240BBDB1-3501-4637-8A17-996EA4EBB20B} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} {88EF760A-99A2-48C8-920F-78632A3BB57A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} {9593691E-1B65-4EB1-97AA-F8B292B0082A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {12544BE3-B7B9-42EA-A6BD-C354C9F39568} = {EE98F905-C0E0-4A09-8B0E-5F8728EB14CF} + {9F1C63CA-BBE9-468A-B8E1-1C28A7D09F32} = {EE98F905-C0E0-4A09-8B0E-5F8728EB14CF} + {D9A5379C-EA5B-4AAE-8C84-46FAF40E4EEB} = {9F1C63CA-BBE9-468A-B8E1-1C28A7D09F32} + {B76BE944-681D-4887-9F90-5A24AD5924CB} = {D9A5379C-EA5B-4AAE-8C84-46FAF40E4EEB} + {4209F2B4-0388-47DF-A054-C974ABE78723} = {9EC158BE-EB9C-4627-931D-B1B95D3210B6} + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752} = {C6E2B73F-137E-4C37-84DE-0863B1C30D23} + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C} = {C6E2B73F-137E-4C37-84DE-0863B1C30D23} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {81AADD49-473B-43ED-8A08-F6B7A058AA39} diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AssemblyInfo.cs b/src/Azure/AzureAppServices.HostingStartup/src/AssemblyInfo.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AssemblyInfo.cs rename to src/Azure/AzureAppServices.HostingStartup/src/AssemblyInfo.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AzureAppServicesHostingStartup.cs b/src/Azure/AzureAppServices.HostingStartup/src/AzureAppServicesHostingStartup.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AzureAppServicesHostingStartup.cs rename to src/Azure/AzureAppServices.HostingStartup/src/AzureAppServicesHostingStartup.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/HostingStartupConfigurationExtensions.cs b/src/Azure/AzureAppServices.HostingStartup/src/HostingStartupConfigurationExtensions.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/HostingStartupConfigurationExtensions.cs rename to src/Azure/AzureAppServices.HostingStartup/src/HostingStartupConfigurationExtensions.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj similarity index 50% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj rename to src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj index ef7e900325..2bd0da75c0 100644 --- a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj +++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj @@ -1,6 +1,6 @@  - + ASP.NET Core lightup integration with Azure AppServices. @@ -10,11 +10,8 @@ - - - - - + + diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netcore.json b/src/Azure/AzureAppServices.HostingStartup/src/baseline.netcore.json similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netcore.json rename to src/Azure/AzureAppServices.HostingStartup/src/baseline.netcore.json diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netframework.json b/src/Azure/AzureAppServices.HostingStartup/src/baseline.netframework.json similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netframework.json rename to src/Azure/AzureAppServices.HostingStartup/src/baseline.netframework.json diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/AppServicesWebHostBuilderExtensions.cs b/src/Azure/AzureAppServicesIntegration/src/AppServicesWebHostBuilderExtensions.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/AppServicesWebHostBuilderExtensions.cs rename to src/Azure/AzureAppServicesIntegration/src/AppServicesWebHostBuilderExtensions.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj similarity index 63% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj rename to src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj index 09377e396b..444f87a42e 100644 --- a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj +++ b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Properties/AssemblyInfo.cs b/src/Azure/AzureAppServicesIntegration/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Properties/AssemblyInfo.cs rename to src/Azure/AzureAppServicesIntegration/src/Properties/AssemblyInfo.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/baseline.netcore.json b/src/Azure/AzureAppServicesIntegration/src/baseline.netcore.json similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/baseline.netcore.json rename to src/Azure/AzureAppServicesIntegration/src/baseline.netcore.json diff --git a/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/AppServicesWebHostBuilderExtensionsTest.cs b/src/Azure/AzureAppServicesIntegration/test/AppServicesWebHostBuilderExtensionsTest.cs similarity index 100% rename from src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/AppServicesWebHostBuilderExtensionsTest.cs rename to src/Azure/AzureAppServicesIntegration/test/AppServicesWebHostBuilderExtensionsTest.cs diff --git a/src/Azure/AzureAppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj b/src/Azure/AzureAppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj new file mode 100644 index 0000000000..278ad9b30e --- /dev/null +++ b/src/Azure/AzureAppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + diff --git a/src/AzureIntegration/build/hostingstartup.targets b/src/Azure/hostingstartup.targets similarity index 100% rename from src/AzureIntegration/build/hostingstartup.targets rename to src/Azure/hostingstartup.targets diff --git a/src/Azure/samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj b/src/Azure/samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj new file mode 100644 index 0000000000..c26ee03cb6 --- /dev/null +++ b/src/Azure/samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj @@ -0,0 +1,15 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + + + diff --git a/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Startup.cs b/src/Azure/samples/AzureAppServicesHostingStartupSample/Startup.cs similarity index 100% rename from src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Startup.cs rename to src/Azure/samples/AzureAppServicesHostingStartupSample/Startup.cs diff --git a/src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj b/src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj new file mode 100644 index 0000000000..6f9d5b17ff --- /dev/null +++ b/src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj @@ -0,0 +1,15 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + + + diff --git a/src/AzureIntegration/sample/AzureAppServicesSample/Startup.cs b/src/Azure/samples/AzureAppServicesSample/Startup.cs similarity index 100% rename from src/AzureIntegration/sample/AzureAppServicesSample/Startup.cs rename to src/Azure/samples/AzureAppServicesSample/Startup.cs diff --git a/src/AzureIntegration/AzureIntegration.sln b/src/AzureIntegration/AzureIntegration.sln index 5ef2360204..5ca7e2c54a 100644 --- a/src/AzureIntegration/AzureIntegration.sln +++ b/src/AzureIntegration/AzureIntegration.sln @@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27016.1 MinimumVisualStudioVersion = 15.0.26730.03 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration", "src\Microsoft.AspNetCore.AzureAppServicesIntegration\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj", "{5916BEB5-0969-469B-976C-A392E015DFAC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FF9B744E-6C59-40CC-9E41-9D2EBD292435}" ProjectSection(SolutionItems) = preProject src\Directory.Build.props = src\Directory.Build.props @@ -17,41 +15,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution NuGet.config = NuGet.config EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesSample", "sample\AzureAppServicesSample\AzureAppServicesSample.csproj", "{05A4D308-B162-4194-BC5E-88CCB4DBD318}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{37237C93-6855-40D9-9E60-418B093EF49A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CD650B4B-81C2-4A44-AEF2-A251A877C1F0}" ProjectSection(SolutionItems) = preProject test\Directory.Build.props = test\Directory.Build.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "test\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj", "{9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.HostingStartup", "src\Microsoft.AspNetCore.AzureAppServices.HostingStartup\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj", "{AC023B45-7995-4D4A-8108-E512AE8E5734}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesHostingStartupSample", "sample\AzureAppServicesHostingStartupSample\AzureAppServicesHostingStartupSample.csproj", "{939EA897-CA31-4F2E-BA51-22B570B64671}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApplicationInsights.HostingStartup", "src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj", "{2849A2D9-7C08-4198-BF2B-8BFB4B13554D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsHostingStartupSample", "sample\ApplicationInsightsHostingStartupSample\ApplicationInsightsHostingStartupSample.csproj", "{33E245F0-2566-4B5B-BA7C-8895B7A697AE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.Xdt.Extensions", "src\Microsoft.Web.Xdt.Extensions\Microsoft.Web.Xdt.Extensions.csproj", "{9B22E525-FEC9-4C7C-9F9C-598C15BD0250}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension", "extensions\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj", "{1CE2D76B-39E6-46C0-8F6F-C63E370955A9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsights.HostingStartup.Tests", "test\ApplicationInsights.HostingStartup.Tests\ApplicationInsights.HostingStartup.Tests.csproj", "{0899A101-E451-40A4-81B0-7AA18202C25D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.FunctionalTests", "test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\Microsoft.AspNetCore.AzureAppServices.FunctionalTests.csproj", "{2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.Xdt.Extensions.Tests", "test\Microsoft.Web.Xdt.Extensions.Tests\Microsoft.Web.Xdt.Extensions.Tests.csproj", "{809AEE05-1B28-4E31-8959-776B249BD725}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests", "test\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj", "{491A857A-3529-4375-985D-D748F9F01476}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApplicationModelDetection", "src\Microsoft.Extensions.ApplicationModelDetection\Microsoft.Extensions.ApplicationModelDetection.csproj", "{F0CABFE8-A5B1-487B-A451-A486D26742D3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApplicationModelDetection.Tests", "test\Microsoft.Extensions.ApplicationModelDetection.Tests\Microsoft.Extensions.ApplicationModelDetection.Tests.csproj", "{15664836-2B94-4D2D-AC18-6DED01FCCCBD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Runtime.SiteExtension", "extensions\Microsoft.AspNetCore.Runtime.SiteExtension\Microsoft.AspNetCore.Runtime.SiteExtension.csproj", "{E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}" EndProject Global @@ -60,34 +38,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5916BEB5-0969-469B-976C-A392E015DFAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5916BEB5-0969-469B-976C-A392E015DFAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5916BEB5-0969-469B-976C-A392E015DFAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5916BEB5-0969-469B-976C-A392E015DFAC}.Release|Any CPU.Build.0 = Release|Any CPU - {05A4D308-B162-4194-BC5E-88CCB4DBD318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05A4D308-B162-4194-BC5E-88CCB4DBD318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05A4D308-B162-4194-BC5E-88CCB4DBD318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05A4D308-B162-4194-BC5E-88CCB4DBD318}.Release|Any CPU.Build.0 = Release|Any CPU - {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|Any CPU.Build.0 = Release|Any CPU - {AC023B45-7995-4D4A-8108-E512AE8E5734}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC023B45-7995-4D4A-8108-E512AE8E5734}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC023B45-7995-4D4A-8108-E512AE8E5734}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC023B45-7995-4D4A-8108-E512AE8E5734}.Release|Any CPU.Build.0 = Release|Any CPU - {939EA897-CA31-4F2E-BA51-22B570B64671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {939EA897-CA31-4F2E-BA51-22B570B64671}.Debug|Any CPU.Build.0 = Debug|Any CPU - {939EA897-CA31-4F2E-BA51-22B570B64671}.Release|Any CPU.ActiveCfg = Release|Any CPU - {939EA897-CA31-4F2E-BA51-22B570B64671}.Release|Any CPU.Build.0 = Release|Any CPU - {2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Release|Any CPU.Build.0 = Release|Any CPU - {33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Release|Any CPU.Build.0 = Release|Any CPU {9B22E525-FEC9-4C7C-9F9C-598C15BD0250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B22E525-FEC9-4C7C-9F9C-598C15BD0250}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B22E525-FEC9-4C7C-9F9C-598C15BD0250}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -96,10 +46,6 @@ Global {1CE2D76B-39E6-46C0-8F6F-C63E370955A9}.Debug|Any CPU.Build.0 = Debug|Any CPU {1CE2D76B-39E6-46C0-8F6F-C63E370955A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {1CE2D76B-39E6-46C0-8F6F-C63E370955A9}.Release|Any CPU.Build.0 = Release|Any CPU - {0899A101-E451-40A4-81B0-7AA18202C25D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0899A101-E451-40A4-81B0-7AA18202C25D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0899A101-E451-40A4-81B0-7AA18202C25D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0899A101-E451-40A4-81B0-7AA18202C25D}.Release|Any CPU.Build.0 = Release|Any CPU {2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -112,14 +58,6 @@ Global {491A857A-3529-4375-985D-D748F9F01476}.Debug|Any CPU.Build.0 = Debug|Any CPU {491A857A-3529-4375-985D-D748F9F01476}.Release|Any CPU.ActiveCfg = Release|Any CPU {491A857A-3529-4375-985D-D748F9F01476}.Release|Any CPU.Build.0 = Release|Any CPU - {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Release|Any CPU.Build.0 = Release|Any CPU - {15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Release|Any CPU.Build.0 = Release|Any CPU {E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}.Debug|Any CPU.Build.0 = Debug|Any CPU {E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -129,21 +67,11 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {5916BEB5-0969-469B-976C-A392E015DFAC} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} - {05A4D308-B162-4194-BC5E-88CCB4DBD318} = {37237C93-6855-40D9-9E60-418B093EF49A} - {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} - {AC023B45-7995-4D4A-8108-E512AE8E5734} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} - {939EA897-CA31-4F2E-BA51-22B570B64671} = {37237C93-6855-40D9-9E60-418B093EF49A} - {2849A2D9-7C08-4198-BF2B-8BFB4B13554D} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} - {33E245F0-2566-4B5B-BA7C-8895B7A697AE} = {37237C93-6855-40D9-9E60-418B093EF49A} {9B22E525-FEC9-4C7C-9F9C-598C15BD0250} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} {1CE2D76B-39E6-46C0-8F6F-C63E370955A9} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} - {0899A101-E451-40A4-81B0-7AA18202C25D} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} {2B2C37FF-9249-4EA4-9A7F-038B55A15C2C} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} {809AEE05-1B28-4E31-8959-776B249BD725} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} {491A857A-3529-4375-985D-D748F9F01476} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} - {F0CABFE8-A5B1-487B-A451-A486D26742D3} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} - {15664836-2B94-4D2D-AC18-6DED01FCCCBD} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} {E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj b/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj deleted file mode 100644 index bf8548b179..0000000000 --- a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - netcoreapp2.1;netcoreapp2.0;net461 - win7-x86;win7-x64;linux-x64;osx-x64 - - - - - - - - - - - - - - - - - - - diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json b/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json deleted file mode 100644 index beabdcaf51..0000000000 --- a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:22071/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup;Microsoft.AspNetCore.Server.IISIntegration" - } - }, - "ApplicationInsightsHostingStartupSample": { - "commandName": "project", - "launchBrowser": true, - "launchUrl": "http://localhost:5000/", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup" - } - } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj b/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj deleted file mode 100644 index 02512aaff6..0000000000 --- a/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp2.1;net461 - - - - - - - - - - - - - - diff --git a/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json b/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json deleted file mode 100644 index 731d8620e9..0000000000 --- a/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:22071/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.AzureAppServices.HostingStartup;Microsoft.AspNetCore.Server.IISIntegration" - } - }, - "AzureAppServicesHostingStartupSample": { - "commandName": "IISExpress", - "launchBrowser": true - } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/sample/AzureAppServicesSample/AzureAppServicesSample.csproj b/src/AzureIntegration/sample/AzureAppServicesSample/AzureAppServicesSample.csproj deleted file mode 100644 index ef66ac77d1..0000000000 --- a/src/AzureIntegration/sample/AzureAppServicesSample/AzureAppServicesSample.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp2.1;net461 - - - - - - - - - - - - - - diff --git a/src/AzureIntegration/sample/AzureAppServicesSample/Properties/launchSettings.json b/src/AzureIntegration/sample/AzureAppServicesSample/Properties/launchSettings.json deleted file mode 100644 index 93ebc1db03..0000000000 --- a/src/AzureIntegration/sample/AzureAppServicesSample/Properties/launchSettings.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:64358/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Server.IISIntegration" - } - }, - "AzureAppServicesSample": { - "commandName": "IISExpress", - "launchBrowser": true - } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj b/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj deleted file mode 100644 index a5d6941581..0000000000 --- a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - ASP.NET Core lightup integration with Application Insights. - netcoreapp2.1;netcoreapp2.0;net461 - true - aspnetcore;ApplicationInsights;Analytics;Telemetry;AppInsights - - - - - - - - - - - - - diff --git a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetectionResult.cs b/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetectionResult.cs deleted file mode 100644 index 96e53dc52d..0000000000 --- a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetectionResult.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.Extensions.ApplicationModelDetection -{ - public class AppModelDetectionResult - { - public RuntimeFramework? Framework { get; set; } - public string FrameworkVersion { get; set; } - public string AspNetCoreVersion { get; set; } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetector.cs b/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetector.cs deleted file mode 100644 index e42a8f2918..0000000000 --- a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetector.cs +++ /dev/null @@ -1,250 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Reflection.Metadata; -using System.Reflection.PortableExecutable; -using System.Xml.Linq; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - -namespace Microsoft.Extensions.ApplicationModelDetection -{ - public class AppModelDetector - { - // We use Hosting package to detect AspNetCore version - // it contains light-up implemenation that we care about and - // would have to be used by aspnet core web apps - private const string AspNetCoreAssembly = "Microsoft.AspNetCore.Hosting"; - - /// - /// Reads the following sources - /// - web.config to detect dotnet framework kind - /// - *.runtimeconfig.json to detect target framework version - /// - *.deps.json to detect Asp.Net Core version - /// - Microsoft.AspNetCore.Hosting.dll to detect Asp.Net Core version - /// - /// The application directory - /// The instance containing information about application - public AppModelDetectionResult Detect(DirectoryInfo directory) - { - string entryPoint = null; - - // Try reading web.config and resolving framework and app path - var webConfig = directory.GetFiles("web.config").FirstOrDefault(); - - bool webConfigExists = webConfig != null; - bool? usesDotnetExe = null; - - if (webConfigExists && - TryParseWebConfig(webConfig, out var dotnetExe, out entryPoint)) - { - usesDotnetExe = dotnetExe; - } - - // If we found entry point let's look for .deps.json - // in some cases it exists in desktop too - FileInfo depsJson = null; - FileInfo runtimeConfig = null; - - if (!string.IsNullOrWhiteSpace(entryPoint)) - { - depsJson = new FileInfo(Path.ChangeExtension(entryPoint, ".deps.json")); - runtimeConfig = new FileInfo(Path.ChangeExtension(entryPoint, ".runtimeconfig.json")); - } - - if (depsJson == null || !depsJson.Exists) - { - depsJson = directory.GetFiles("*.deps.json").FirstOrDefault(); - } - - if (runtimeConfig == null || !runtimeConfig.Exists) - { - runtimeConfig = directory.GetFiles("*.runtimeconfig.json").FirstOrDefault(); - } - - string aspNetCoreVersionFromDeps = null; - string aspNetCoreVersionFromDll = null; - - - // Try to detect ASP.NET Core version from .deps.json - if (depsJson != null && - depsJson.Exists && - TryParseDependencies(depsJson, out var aspNetCoreVersion)) - { - aspNetCoreVersionFromDeps = aspNetCoreVersion; - } - - // Try to detect ASP.NET Core version from .deps.json - var aspNetCoreDll = directory.GetFiles(AspNetCoreAssembly + ".dll").FirstOrDefault(); - if (aspNetCoreDll != null && - TryParseAssembly(aspNetCoreDll, out aspNetCoreVersion)) - { - aspNetCoreVersionFromDll = aspNetCoreVersion; - } - - // Try to detect dotnet core runtime version from runtimeconfig.json - string runtimeVersionFromRuntimeConfig = null; - if (runtimeConfig != null && - runtimeConfig.Exists) - { - TryParseRuntimeConfig(runtimeConfig, out runtimeVersionFromRuntimeConfig); - } - - var result = new AppModelDetectionResult(); - if (usesDotnetExe == true) - { - result.Framework = RuntimeFramework.DotNetCore; - result.FrameworkVersion = runtimeVersionFromRuntimeConfig; - } - else - { - if (depsJson?.Exists == true && - runtimeConfig?.Exists == true) - { - result.Framework = RuntimeFramework.DotNetCoreStandalone; - } - else - { - result.Framework = RuntimeFramework.DotNetFramework; - } - } - - result.AspNetCoreVersion = aspNetCoreVersionFromDeps ?? aspNetCoreVersionFromDll; - - return result; - } - - private bool TryParseAssembly(FileInfo aspNetCoreDll, out string aspNetCoreVersion) - { - aspNetCoreVersion = null; - try - { - using (var stream = aspNetCoreDll.OpenRead()) - using (var peReader = new PEReader(stream)) - { - var metadataReader = peReader.GetMetadataReader(); - var assemblyDefinition = metadataReader.GetAssemblyDefinition(); - aspNetCoreVersion = assemblyDefinition.Version.ToString(); - return true; - } - } - catch (Exception) - { - return false; - } - } - - /// - /// Search for Microsoft.AspNetCore.Hosting entry in deps.json and get it's version number - /// - private bool TryParseDependencies(FileInfo depsJson, out string aspnetCoreVersion) - { - aspnetCoreVersion = null; - try - { - using (var streamReader = depsJson.OpenText()) - using (var jsonReader = new JsonTextReader(streamReader)) - { - var json = JObject.Load(jsonReader); - - var libraryPrefix = AspNetCoreAssembly+ "/"; - - var library = json.Descendants().OfType().FirstOrDefault(property => property.Name.StartsWith(libraryPrefix)); - if (library != null) - { - aspnetCoreVersion = library.Name.Substring(libraryPrefix.Length); - return true; - } - } - } - catch (Exception) - { - } - return false; - } - - private bool TryParseRuntimeConfig(FileInfo runtimeConfig, out string frameworkVersion) - { - frameworkVersion = null; - try - { - using (var streamReader = runtimeConfig.OpenText()) - using (var jsonReader = new JsonTextReader(streamReader)) - { - var json = JObject.Load(jsonReader); - frameworkVersion = (string)json?["runtimeOptions"] - ?["framework"] - ?["version"]; - - return true; - } - } - catch (Exception) - { - return false; - } - } - - private bool TryParseWebConfig(FileInfo webConfig, out bool usesDotnetExe, out string entryPoint) - { - usesDotnetExe = false; - entryPoint = null; - - try - { - var xdocument = XDocument.Load(webConfig.FullName); - var aspNetCoreHandler = xdocument.Root? - .Element("system.webServer") - .Element("aspNetCore"); - - if (aspNetCoreHandler == null) - { - return false; - } - - var processPath = (string) aspNetCoreHandler.Attribute("processPath"); - var arguments = (string) aspNetCoreHandler.Attribute("arguments"); - - if (processPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase) || - processPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase) && - !string.IsNullOrWhiteSpace(arguments)) - { - usesDotnetExe = true; - var entryPointPart = arguments.Split(new[] {" "}, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(); - - if (!string.IsNullOrWhiteSpace(entryPointPart)) - { - try - { - entryPoint = Path.GetFullPath(Path.Combine(webConfig.DirectoryName, entryPointPart)); - } - catch (Exception) - { - } - } - } - else - { - usesDotnetExe = false; - - try - { - entryPoint = Path.GetFullPath(Path.Combine(webConfig.DirectoryName, processPath)); - } - catch (Exception) - { - } - } - } - catch (Exception) - { - return false; - } - - return true; - } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/Microsoft.Extensions.ApplicationModelDetection.csproj b/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/Microsoft.Extensions.ApplicationModelDetection.csproj deleted file mode 100644 index aae6b8bf52..0000000000 --- a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/Microsoft.Extensions.ApplicationModelDetection.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - ASP.NET Core integration with Azure AppServices. - netstandard2.0 - $(NoWarn);CS1591 - true - true - aspnetcore;azure;appservices - - - - - - - \ No newline at end of file diff --git a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/RuntimeFramework.cs b/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/RuntimeFramework.cs deleted file mode 100644 index b182c79eec..0000000000 --- a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/RuntimeFramework.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.Extensions.ApplicationModelDetection -{ - public enum RuntimeFramework - { - DotNetCore, - DotNetCoreStandalone, - DotNetFramework - } -} \ No newline at end of file diff --git a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/baseline.netcore.json b/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/baseline.netcore.json deleted file mode 100644 index d94df11f0a..0000000000 --- a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/baseline.netcore.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "AssemblyIdentity": "Microsoft.Extensions.ApplicationModelDetection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "Microsoft.Extensions.ApplicationModelDetection.AppModelDetectionResult", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Framework", - "Parameters": [], - "ReturnType": "System.Nullable", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Framework", - "Parameters": [ - { - "Name": "value", - "Type": "System.Nullable" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_FrameworkVersion", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_FrameworkVersion", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_AspNetCoreVersion", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_AspNetCoreVersion", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.ApplicationModelDetection.AppModelDetector", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "Detect", - "Parameters": [ - { - "Name": "directory", - "Type": "System.IO.DirectoryInfo" - } - ], - "ReturnType": "Microsoft.Extensions.ApplicationModelDetection.AppModelDetectionResult", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.ApplicationModelDetection.RuntimeFramework", - "Visibility": "Public", - "Kind": "Enumeration", - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Field", - "Name": "DotNetCore", - "Parameters": [], - "GenericParameter": [], - "Literal": "0" - }, - { - "Kind": "Field", - "Name": "DotNetCoreStandalone", - "Parameters": [], - "GenericParameter": [], - "Literal": "1" - }, - { - "Kind": "Field", - "Name": "DotNetFramework", - "Parameters": [], - "GenericParameter": [], - "Literal": "2" - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj b/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj deleted file mode 100644 index 424386bd43..0000000000 --- a/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - diff --git a/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/AppModelTests.cs b/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/AppModelTests.cs deleted file mode 100644 index 02e420d2e4..0000000000 --- a/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/AppModelTests.cs +++ /dev/null @@ -1,229 +0,0 @@ -// // Copyright (c) .NET Foundation. All rights reserved. -// // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using Microsoft.AspNetCore.Hosting; -using Xunit; - -namespace Microsoft.Extensions.ApplicationModelDetection.Tests -{ - public class AppModelTests - { - private const string EmptyWebConfig = @""; - - [Theory] - [InlineData("dotnet")] - [InlineData("dotnet.exe")] - [InlineData("%HOME%/dotnet")] - [InlineData("%HOME%/dotnet.exe")] - [InlineData("DoTNeT.ExE")] - public void DetectsCoreFrameworkFromWebConfig(string processPath) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config",GenerateWebConfig(processPath, ".\\app.dll"))) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCore, result.Framework); - } - } - - [Theory] - [InlineData("app")] - [InlineData("app.exe")] - [InlineData("%HOME%/app")] - [InlineData("%HOME%/app.exe")] - public void DetectsFullFrameworkFromWebConfig(string processPath) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig(processPath, ".\\app.dll"))) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetFramework, result.Framework); - } - } - - [Theory] - [InlineData("2.0.0")] - [InlineData("2.0.0-preview1")] - [InlineData("1.1.3")] - public void DetectsRuntimeVersionFromRuntimeConfig(string runtimeVersion) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig("dotnet", ".\\app.dll")) - .WithFile("app.runtimeconfig.json", @"{ - ""runtimeOptions"": { - ""tfm"": ""netcoreapp2.0"", - ""framework"": { - ""name"": ""Microsoft.NETCore.App"", - ""version"": """+ runtimeVersion + @""" - }, - ""configProperties"": { - ""System.GC.Server"": true - } - } -}")) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCore, result.Framework); - Assert.Equal(runtimeVersion, result.FrameworkVersion); - } - } - - - [Theory] - [InlineData("2.0.0")] - [InlineData("2.0.0-preview1")] - [InlineData("1.1.3")] - public void DetectsRuntimeVersionFromRuntimeConfigWitoutEntryPoint(string runtimeVersion) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig("dotnet", "%HOME%\\app.dll")) - .WithFile("app.runtimeconfig.json", @"{ - ""runtimeOptions"": { - ""tfm"": ""netcoreapp2.0"", - ""framework"": { - ""name"": ""Microsoft.NETCore.App"", - ""version"": """+ runtimeVersion + @""" - }, - ""configProperties"": { - ""System.GC.Server"": true - } - } -}")) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCore, result.Framework); - Assert.Equal(runtimeVersion, result.FrameworkVersion); - } - } - - [Theory] - [InlineData("2.0.0")] - [InlineData("2.0.0-preview1")] - [InlineData("1.1.3")] - public void DetectsAspNetCoreVersionFromDepsFile(string runtimeVersion) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig("dotnet", "app.dll")) - .WithFile("app.deps.json", @"{ - ""targets"": { - "".NETCoreApp,Version=v2.7"": { - ""Microsoft.AspNetCore.Hosting/" + runtimeVersion + @""": { } - } - } -}")) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCore, result.Framework); - Assert.Equal(runtimeVersion, result.AspNetCoreVersion); - } - } - - [Theory] - [InlineData("2.0.0")] - [InlineData("2.0.0-preview1")] - [InlineData("1.1.3")] - public void DetectsAspNetCoreVersionFromDepsFileWithoutEntryPoint(string runtimeVersion) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig("dotnet", "%HOME%\\app.dll")) - .WithFile("app.deps.json", @"{ - ""targets"": { - "".NETCoreApp,Version=v2.7"": { - ""Microsoft.AspNetCore.Hosting/" + runtimeVersion + @""": { } - } - } -}")) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCore, result.Framework); - Assert.Equal(runtimeVersion, result.AspNetCoreVersion); - } - } - - [Fact] - public void DetectsFullFrameworkWhenWebConfigExists() - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", EmptyWebConfig)) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetFramework, result.Framework); - } - } - - [Fact] - public void DetectsStandalone_WhenBothDepsAndRuntimeConfigExist() - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig("app.exe", "")) - .WithFile("app.runtimeconfig.json", "{}") - .WithFile("app.deps.json", "{}")) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCoreStandalone, result.Framework); - } - } - - [Fact] - public void DetectsAspNetCoreVersionFromHostingDll() - { - using (var temp = new TemporaryDirectory() - .WithFile(typeof(WebHostBuilder).Assembly.Location)) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(typeof(WebHostBuilder).Assembly.GetName().Version.ToString(), result.AspNetCoreVersion); - } - } - - private static string GenerateWebConfig(string processPath, string arguments) - { - return $@" - - - - - - - - -"; - } - - private class TemporaryDirectory: IDisposable - { - public TemporaryDirectory() - { - Directory = new DirectoryInfo(Path.GetTempPath()) - .CreateSubdirectory(Guid.NewGuid().ToString("N")); - } - - public DirectoryInfo Directory { get; } - - public void Dispose() - { - try - { - Directory.Delete(true); - } - catch (IOException) - { - } - } - - public TemporaryDirectory WithFile(string name, string value) - { - File.WriteAllText(Path.Combine(Directory.FullName, name), value); - return this; - } - - - public TemporaryDirectory WithFile(string name) - { - File.Copy(name, Path.Combine(Directory.FullName, Path.GetFileName(name))); - return this; - } - } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/Microsoft.Extensions.ApplicationModelDetection.Tests.csproj b/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/Microsoft.Extensions.ApplicationModelDetection.Tests.csproj deleted file mode 100644 index b68825fcc0..0000000000 --- a/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/Microsoft.Extensions.ApplicationModelDetection.Tests.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp2.0;net461 - netcoreapp2.0 - - - - - - - \ No newline at end of file From 9ab501e3b1b4ca2daf5dcd6cf168b9b35e7da027 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 2 Jan 2019 10:21:19 -0800 Subject: [PATCH 46/80] Remove file that should be ignored --- .../CommonLib/aspnetcore_msg.h | 328 ------------------ 1 file changed, 328 deletions(-) delete mode 100644 src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h deleted file mode 100644 index 57f402cdef..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h +++ /dev/null @@ -1,328 +0,0 @@ -/*++ - - Copyright (c) .NET Foundation. All rights reserved. - Licensed under the MIT License. See License.txt in the project root for license information. - -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_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_LOAD_CLR_FALIURE -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_LOAD_CLR_FALIURE ((DWORD)0x000003EFL) - -// -// MessageId: ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP ((DWORD)0x000003F0L) - -// -// MessageId: ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR ((DWORD)0x000003F1L) - -// -// MessageId: ASPNETCORE_EVENT_ADD_APPLICATION_ERROR -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR ((DWORD)0x000003F2L) - -// -// MessageId: ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT ((DWORD)0x000003F3L) - -// -// MessageId: ASPNETCORE_EVENT_RECYCLE_APPOFFLINE -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_RECYCLE_APPOFFLINE ((DWORD)0x000003F4L) - -// -// MessageId: ASPNETCORE_EVENT_MODULE_DISABLED -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_MODULE_DISABLED ((DWORD)0x000003F5L) - -// -// MessageId: ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION ((DWORD)0x000003FAL) - -// -// MessageId: ASPNETCORE_EVENT_PROCESS_START_FAILURE -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_PROCESS_START_FAILURE ((DWORD)0x000003FCL) - -// -// MessageId: ASPNETCORE_EVENT_RECYCLE_CONFIGURATION -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_RECYCLE_CONFIGURATION ((DWORD)0x000003FDL) - -// -// MessageId: ASPNETCORE_EVENT_RECYCLE_APP_FAILURE -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_RECYCLE_APP_FAILURE ((DWORD)0x000003FEL) - -// -// MessageId: ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR ((DWORD)0x00000400L) - -// -// MessageId: ASPNETCORE_EVENT_GENERAL_INFO -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_GENERAL_INFO ((DWORD)0x00000401L) - -// -// MessageId: ASPNETCORE_EVENT_GENERAL_WARNING -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_GENERAL_WARNING ((DWORD)0x00000402L) - -// -// MessageId: ASPNETCORE_EVENT_GENERAL_ERROR -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_GENERAL_ERROR ((DWORD)0x00000403L) - -// -// MessageId: ASPNETCORE_EVENT_INPROCESS_RH_MISSING -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_INPROCESS_RH_MISSING ((DWORD)0x00000404L) - -// -// MessageId: ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING ((DWORD)0x00000405L) - -// -// MessageId: ASPNETCORE_EVENT_PROCESS_SHUTDOWN -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_PROCESS_SHUTDOWN ((DWORD)0x00000406L) - -// -// MessageId: ASPNETCORE_EVENT_INPROCESS_START_ERROR -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_INPROCESS_START_ERROR ((DWORD)0x00000407L) - -// -// MessageId: ASPNETCORE_EVENT_INPROCESS_START_SUCCESS -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_INPROCESS_START_SUCCESS ((DWORD)0x00000408L) - -// -// MessageId: ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL ((DWORD)0x00000409L) - -// -// MessageId: ASPNETCORE_CONFIGURATION_LOAD_ERROR -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_CONFIGURATION_LOAD_ERROR ((DWORD)0x0000040AL) - -// -// MessageId: ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT ((DWORD)0x0000040BL) - -// -// MessageId: ASPNETCORE_EVENT_DEBUG_LOG -// -// MessageText: -// -// %1 -// -#define ASPNETCORE_EVENT_DEBUG_LOG ((DWORD)0x0000040CL) - - -#endif // _ASPNETCORE_MODULE_MSG_H_ - From f182b1adaca540574701adfd7b9a93853c30b222 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Sat, 29 Dec 2018 15:05:06 -0800 Subject: [PATCH 47/80] Add sufficient projects to Mvc.NoFun.sln for it to build in VS nit: ignore .vscode/ directories --- .gitignore | 1 + src/Mvc/Mvc.NoFun.sln | 572 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 573 insertions(+) diff --git a/.gitignore b/.gitignore index ac23b44637..6d3c5c15c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ bin/ obj/ .vs/ +.vscode/ *.suo *.user _ReSharper.* diff --git a/src/Mvc/Mvc.NoFun.sln b/src/Mvc/Mvc.NoFun.sln index 95fa410bcc..2a17a7db85 100644 --- a/src/Mvc/Mvc.NoFun.sln +++ b/src/Mvc/Mvc.NoFun.sln @@ -121,6 +121,84 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance.Views", "benchmarks\Microsoft.AspNetCore.Mvc.Performance.Views\Microsoft.AspNetCore.Mvc.Performance.Views.csproj", "{9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "..\Antiforgery\src\Microsoft.AspNetCore.Antiforgery.csproj", "{ABF364DD-5415-4234-9C1C-BAE30EE243B2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Abstractions", "..\Http\Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "{46C69B2A-74C3-450B-B19E-EAE15298A6D7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Core", "..\Http\Authentication.Core\src\Microsoft.AspNetCore.Authentication.Core.csproj", "{3BA943A3-EF92-4D2C-A148-2BB18444D548}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "..\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj", "{4AA9A6DF-8A9D-41E2-916A-D970C63E357A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "..\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "..\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj", "{C8855927-37B3-44C7-8EAE-B05615EFEF84}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.Internal", "..\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj", "{46335D95-121F-4B85-8B86-D4BB043CC2CA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "..\DataProtection\DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{A60D1892-4080-410D-B069-D023D244A9AC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "..\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{1226FA9A-428C-4911-AC01-15C1AD44A35C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "..\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj", "{875EFC54-B4DE-4814-B272-37BBC1D8E532}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "..\Hosting\Server.Abstractions\src\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", "{20934FC5-8C76-4A0B-AC94-D23BBFD1601D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions", "..\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj", "{612E332E-2522-46E7-816F-4B95B7BEB75E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{7063C0F0-C924-4304-BF24-1182542B0D8E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions", "..\Http\Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj", "{D38FE75C-0419-411B-96EB-80334F07103B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions", "..\Http\Http.Extensions\src\Microsoft.AspNetCore.Http.Extensions.csproj", "{22D261EF-670E-44D2-A2C5-4E79414EB10B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features", "..\Http\Http.Features\src\Microsoft.AspNetCore.Http.Features.csproj", "{A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides", "..\Middleware\HttpOverrides\src\Microsoft.AspNetCore.HttpOverrides.csproj", "{657ED986-9E52-423B-A389-F2FD123B4CC1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPatch", "..\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj", "{B2242E8F-0A7B-4358-BC29-56745C89E0DE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization", "..\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj", "{C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "..\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj", "{36BBC92A-539F-4A5C-9215-D72A2B8F73C7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "..\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "..\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj", "{6EF4D17E-D0E4-42E6-895A-67F2F55B4678}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "..\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{2D42D033-14A6-4374-880F-F7CBDEEFE6D2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "..\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{B627BF08-39D1-4B38-B546-BFB98E0F5916}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{4B42670E-9AD5-4D4D-BF70-295BC2B474D4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{138F8243-B512-4FA9-9E3C-ABF5297C7092}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{FE319B31-4267-43D0-A3E2-3857E4F1EDB1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{512F4020-4841-4CDA-BFDA-1AF63B7678BB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{6B19EA89-C2B7-4625-8931-C7B459A54C16}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "..\Http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{C87F83AE-2B23-477C-A577-0DB77191F254}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -607,6 +685,462 @@ Global {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Release|Mixed Platforms.Build.0 = Release|Any CPU {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Release|x86.ActiveCfg = Release|Any CPU {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Release|x86.Build.0 = Release|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|x86.ActiveCfg = Debug|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|x86.Build.0 = Debug|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|Any CPU.Build.0 = Release|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|x86.ActiveCfg = Release|Any CPU + {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|x86.Build.0 = Release|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|x86.ActiveCfg = Debug|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|x86.Build.0 = Debug|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|Any CPU.Build.0 = Release|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|x86.ActiveCfg = Release|Any CPU + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|x86.Build.0 = Release|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|x86.ActiveCfg = Debug|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|x86.Build.0 = Debug|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|Any CPU.Build.0 = Release|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|x86.ActiveCfg = Release|Any CPU + {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|x86.Build.0 = Release|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|x86.ActiveCfg = Debug|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|x86.Build.0 = Debug|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|Any CPU.Build.0 = Release|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|x86.ActiveCfg = Release|Any CPU + {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|x86.Build.0 = Release|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|x86.ActiveCfg = Debug|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|x86.Build.0 = Debug|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|Any CPU.Build.0 = Release|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|x86.ActiveCfg = Release|Any CPU + {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|x86.Build.0 = Release|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|x86.ActiveCfg = Debug|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|x86.Build.0 = Debug|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|Any CPU.Build.0 = Release|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|x86.ActiveCfg = Release|Any CPU + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|x86.Build.0 = Release|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|x86.ActiveCfg = Debug|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|x86.Build.0 = Debug|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|Any CPU.Build.0 = Release|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|x86.ActiveCfg = Release|Any CPU + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|x86.Build.0 = Release|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|x86.ActiveCfg = Debug|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|x86.Build.0 = Debug|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|Any CPU.Build.0 = Release|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|x86.ActiveCfg = Release|Any CPU + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|x86.Build.0 = Release|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|x86.ActiveCfg = Debug|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|x86.Build.0 = Debug|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|Any CPU.Build.0 = Release|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|x86.ActiveCfg = Release|Any CPU + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|x86.Build.0 = Release|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|x86.ActiveCfg = Debug|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|x86.Build.0 = Debug|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|Any CPU.Build.0 = Release|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|x86.ActiveCfg = Release|Any CPU + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|x86.Build.0 = Release|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|x86.ActiveCfg = Debug|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|x86.Build.0 = Debug|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Release|Any CPU.Build.0 = Release|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Release|x86.ActiveCfg = Release|Any CPU + {D38FE75C-0419-411B-96EB-80334F07103B}.Release|x86.Build.0 = Release|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|x86.ActiveCfg = Debug|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|x86.Build.0 = Debug|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|Any CPU.Build.0 = Release|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|x86.ActiveCfg = Release|Any CPU + {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|x86.Build.0 = Release|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|x86.ActiveCfg = Debug|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|x86.Build.0 = Debug|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|Any CPU.Build.0 = Release|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|x86.ActiveCfg = Release|Any CPU + {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|x86.Build.0 = Release|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|x86.ActiveCfg = Debug|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|x86.Build.0 = Debug|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|Any CPU.Build.0 = Release|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|x86.ActiveCfg = Release|Any CPU + {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|x86.Build.0 = Release|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|x86.ActiveCfg = Debug|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|x86.Build.0 = Debug|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|Any CPU.Build.0 = Release|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|x86.ActiveCfg = Release|Any CPU + {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|x86.Build.0 = Release|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|x86.ActiveCfg = Debug|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|x86.Build.0 = Debug|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|Any CPU.Build.0 = Release|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|x86.ActiveCfg = Release|Any CPU + {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|x86.Build.0 = Release|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|x86.ActiveCfg = Debug|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|x86.Build.0 = Debug|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|Any CPU.Build.0 = Release|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|x86.ActiveCfg = Release|Any CPU + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|x86.Build.0 = Release|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|x86.ActiveCfg = Debug|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|x86.Build.0 = Debug|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|Any CPU.Build.0 = Release|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|x86.ActiveCfg = Release|Any CPU + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|x86.Build.0 = Release|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|x86.ActiveCfg = Debug|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|x86.Build.0 = Debug|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|Any CPU.Build.0 = Release|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|x86.ActiveCfg = Release|Any CPU + {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|x86.Build.0 = Release|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|Any CPU.Build.0 = Debug|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|x86.ActiveCfg = Debug|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|x86.Build.0 = Debug|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|Any CPU.ActiveCfg = Release|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|Any CPU.Build.0 = Release|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|x86.ActiveCfg = Release|Any CPU + {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|x86.Build.0 = Release|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|x86.ActiveCfg = Debug|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|x86.Build.0 = Debug|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|Any CPU.Build.0 = Release|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|x86.ActiveCfg = Release|Any CPU + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|x86.Build.0 = Release|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|x86.ActiveCfg = Debug|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|x86.Build.0 = Debug|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|Any CPU.Build.0 = Release|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|x86.ActiveCfg = Release|Any CPU + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|x86.Build.0 = Release|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|x86.ActiveCfg = Debug|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|x86.Build.0 = Debug|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|Any CPU.Build.0 = Release|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|x86.ActiveCfg = Release|Any CPU + {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|x86.Build.0 = Release|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|x86.ActiveCfg = Debug|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|x86.Build.0 = Debug|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|Any CPU.Build.0 = Release|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|x86.ActiveCfg = Release|Any CPU + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|x86.Build.0 = Release|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|x86.ActiveCfg = Debug|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|x86.Build.0 = Debug|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|Any CPU.Build.0 = Release|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|x86.ActiveCfg = Release|Any CPU + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|x86.Build.0 = Release|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|x86.ActiveCfg = Debug|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|x86.Build.0 = Debug|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|Any CPU.Build.0 = Release|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|x86.ActiveCfg = Release|Any CPU + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|x86.Build.0 = Release|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|x86.ActiveCfg = Debug|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|x86.Build.0 = Debug|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|Any CPU.Build.0 = Release|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|x86.ActiveCfg = Release|Any CPU + {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|x86.Build.0 = Release|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|x86.ActiveCfg = Debug|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|x86.Build.0 = Debug|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|Any CPU.Build.0 = Release|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|x86.ActiveCfg = Release|Any CPU + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|x86.Build.0 = Release|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|x86.ActiveCfg = Debug|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|x86.Build.0 = Debug|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Release|Any CPU.Build.0 = Release|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Release|x86.ActiveCfg = Release|Any CPU + {A60D1892-4080-410D-B069-D023D244A9AC}.Release|x86.Build.0 = Release|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|x86.ActiveCfg = Debug|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|x86.Build.0 = Debug|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|Any CPU.Build.0 = Release|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|x86.ActiveCfg = Release|Any CPU + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|x86.Build.0 = Release|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|x86.ActiveCfg = Debug|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|x86.Build.0 = Debug|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|Any CPU.Build.0 = Release|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|x86.ActiveCfg = Release|Any CPU + {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|x86.Build.0 = Release|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|x86.ActiveCfg = Debug|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|x86.Build.0 = Debug|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|Any CPU.Build.0 = Release|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|x86.ActiveCfg = Release|Any CPU + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|x86.Build.0 = Release|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|Any CPU.Build.0 = Debug|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|x86.ActiveCfg = Debug|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|x86.Build.0 = Debug|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|Any CPU.ActiveCfg = Release|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|Any CPU.Build.0 = Release|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|x86.ActiveCfg = Release|Any CPU + {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|x86.Build.0 = Release|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|x86.ActiveCfg = Debug|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|x86.Build.0 = Debug|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|Any CPU.Build.0 = Release|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|x86.ActiveCfg = Release|Any CPU + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|x86.Build.0 = Release|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|x86.ActiveCfg = Debug|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|x86.Build.0 = Debug|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|Any CPU.Build.0 = Release|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|x86.ActiveCfg = Release|Any CPU + {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|x86.Build.0 = Release|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|x86.ActiveCfg = Debug|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|x86.Build.0 = Debug|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|Any CPU.Build.0 = Release|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|x86.ActiveCfg = Release|Any CPU + {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|x86.Build.0 = Release|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|x86.ActiveCfg = Debug|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|x86.Build.0 = Debug|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|Any CPU.Build.0 = Release|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|x86.ActiveCfg = Release|Any CPU + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|x86.Build.0 = Release|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|x86.ActiveCfg = Debug|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|x86.Build.0 = Debug|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|Any CPU.Build.0 = Release|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|x86.ActiveCfg = Release|Any CPU + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -653,6 +1187,44 @@ Global {2F683CF8-B055-46AE-BF83-9D1307F8D45F} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {34E3C302-B767-40C8-B538-3EE2BD4000C4} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74} = {44546170-35BF-448F-88F5-4331AE67AEAE} + {C87F83AE-2B23-477C-A577-0DB77191F254} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {22D261EF-670E-44D2-A2C5-4E79414EB10B} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {3BA943A3-EF92-4D2C-A148-2BB18444D548} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {7063C0F0-C924-4304-BF24-1182542B0D8E} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {2D42D033-14A6-4374-880F-F7CBDEEFE6D2} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {4AA9A6DF-8A9D-41E2-916A-D970C63E357A} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {20934FC5-8C76-4A0B-AC94-D23BBFD1601D} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {D38FE75C-0419-411B-96EB-80334F07103B} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {ABF364DD-5415-4234-9C1C-BAE30EE243B2} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {B2242E8F-0A7B-4358-BC29-56745C89E0DE} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {6B19EA89-C2B7-4625-8931-C7B459A54C16} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {612E332E-2522-46E7-816F-4B95B7BEB75E} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {46C69B2A-74C3-450B-B19E-EAE15298A6D7} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {C8855927-37B3-44C7-8EAE-B05615EFEF84} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {875EFC54-B4DE-4814-B272-37BBC1D8E532} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {512F4020-4841-4CDA-BFDA-1AF63B7678BB} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {6EF4D17E-D0E4-42E6-895A-67F2F55B4678} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {B627BF08-39D1-4B38-B546-BFB98E0F5916} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {4B42670E-9AD5-4D4D-BF70-295BC2B474D4} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {A60D1892-4080-410D-B069-D023D244A9AC} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {657ED986-9E52-423B-A389-F2FD123B4CC1} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {36BBC92A-539F-4A5C-9215-D72A2B8F73C7} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {138F8243-B512-4FA9-9E3C-ABF5297C7092} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {FE319B31-4267-43D0-A3E2-3857E4F1EDB1} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {1226FA9A-428C-4911-AC01-15C1AD44A35C} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {46335D95-121F-4B85-8B86-D4BB043CC2CA} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} + {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D003597F-372F-4068-A2F0-353BE3C3B39A} From 97d3a34a3daf848beb0364c73feeb954852a7a0a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 2 Jan 2019 10:30:09 -0800 Subject: [PATCH 48/80] Fix VS errors about repotasks when repotasks have not been built, and update documentation to indicate that VS users should invoke restore.cmd first (#6295) --- Directory.Build.props | 2 +- docs/BuildFromSource.md | 7 ++++--- startvs.cmd | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e255df9e9a..3b0e6e9dd3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -106,7 +106,7 @@ true - + diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md index c13d20ec92..001b1c2206 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -61,13 +61,14 @@ Before opening our .sln files in Visual Studio or VS Code, you need to perform t 1. Executing the following on command-line: ``` - .\build.cmd + .\restore.cmd ``` This will download required tools and build the entire repository once. At that point, you should be able to open .sln files to work on the projects you care about. -2. Use the `startvs.cmd` script to open Visual Studio .sln files. This script first sets required environment variables. + > :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. On the master branch, we regularly update the versions of .NET Core SDK required to build the repo. + > You will need to restart Visual Studio every time we update the .NET Core SDK. -> :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. Visual Studio will only build projects in a solution file, and makes a best effort to use other files on disk. If you pull many changes, the files on disk may be stale and will need to re-build. +2. Use the `startvs.cmd` script to open Visual Studio .sln files. This script first sets required environment variables. ### Solution files diff --git a/startvs.cmd b/startvs.cmd index 79fde11abd..eb5818a0d7 100644 --- a/startvs.cmd +++ b/startvs.cmd @@ -17,11 +17,6 @@ SET PATH=%DOTNET_ROOT%;%PATH% SET sln=%1 -IF NOT EXIST "%DOTNET_ROOT%\dotnet.exe" ( - echo .NET Core has not yet been installed. Run `build.cmd -restore` to install tools - exit /b 1 -) - IF "%sln%"=="" ( echo Error^: Expected argument ^ echo Usage^: startvs.cmd ^ @@ -29,4 +24,9 @@ IF "%sln%"=="" ( exit /b 1 ) +IF NOT EXIST "%DOTNET_ROOT%\dotnet.exe" ( + echo .NET Core has not yet been installed. Run `%~dp0restore.cmd` to install tools + exit /b 1 +) + start %sln% From 199e3f14a23b5443b33857c61a1d3ca5b721b181 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 31 Dec 2018 12:38:40 -0800 Subject: [PATCH 49/80] Look at ApiConventionType attributes defined on base types Fixes https://github.com/aspnet/AspNetCore/issues/4951 --- .../SymbolApiResponseMetadataProvider.cs | 2 +- .../SymbolApiResponseMetadataProviderTest.cs | 44 +++++++++++++++++++ .../GetResponseMetadataTests.cs | 16 +++++++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiResponseMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiResponseMetadataProvider.cs index 2be586958d..9b6a1b759c 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiResponseMetadataProvider.cs +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiResponseMetadataProvider.cs @@ -160,7 +160,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers internal static IReadOnlyList GetConventionTypes(in ApiControllerSymbolCache symbolCache, IMethodSymbol method) { - var attributes = method.ContainingType.GetAttributes(symbolCache.ApiConventionTypeAttribute).ToArray(); + var attributes = method.ContainingType.GetAttributes(symbolCache.ApiConventionTypeAttribute, inherit: true).ToArray(); if (attributes.Length == 0) { attributes = method.ContainingAssembly.GetAttributes(symbolCache.ApiConventionTypeAttribute).ToArray(); diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiResponseMetadataProviderTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiResponseMetadataProviderTest.cs index 57d823e8c6..d93a2ee158 100644 --- a/src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiResponseMetadataProviderTest.cs +++ b/src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiResponseMetadataProviderTest.cs @@ -290,6 +290,50 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers }); } + [Fact] + public async Task GetDeclaredResponseMetadata_ApiConventionTypeAttributeOnType_Works() + { + // Arrange + var type = typeof(GetDeclaredResponseMetadata_ApiConventionTypeAttributeOnType); + var compilation = await GetResponseMetadataCompilation(); + var controller = compilation.GetTypeByMetadataName(type.FullName); + var method = (IMethodSymbol)controller.GetMembers().First(); + var symbolCache = new ApiControllerSymbolCache(compilation); + + // Act + var result = SymbolApiResponseMetadataProvider.GetDeclaredResponseMetadata(symbolCache, method); + + // Assert + // We should expect 3 entries specified by DefaultApiConventions.Post + Assert.Collection( + result.OrderBy(r => r.StatusCode), + metadata => Assert.True(metadata.IsDefault), + metadata => Assert.Equal(201, metadata.StatusCode), + metadata => Assert.Equal(400, metadata.StatusCode)); + } + + [Fact] + public async Task GetDeclaredResponseMetadata_ApiConventionTypeAttributeOnBaseType_Works() + { + // Arrange + var type = typeof(GetDeclaredResponseMetadata_ApiConventionTypeAttributeOnBaseType); + var compilation = await GetResponseMetadataCompilation(); + var controller = compilation.GetTypeByMetadataName(type.FullName); + var method = (IMethodSymbol)controller.GetMembers().First(); + var symbolCache = new ApiControllerSymbolCache(compilation); + + // Act + var result = SymbolApiResponseMetadataProvider.GetDeclaredResponseMetadata(symbolCache, method); + + // Assert + // We should expect 3 entries specified by DefaultApiConventions.Post + Assert.Collection( + result.OrderBy(r => r.StatusCode), + metadata => Assert.True(metadata.IsDefault), + metadata => Assert.Equal(201, metadata.StatusCode), + metadata => Assert.Equal(400, metadata.StatusCode)); + } + [Fact] public Task GetStatusCode_ReturnsValueFromConstructor() { diff --git a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs index 389617609b..d0728bbef3 100644 --- a/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs +++ b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs @@ -90,4 +90,20 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers } } } + + [ApiConventionType(typeof(DefaultApiConventions))] + public class GetDeclaredResponseMetadata_ApiConventionTypeAttributeOnType : Controller + { + public IActionResult Post(object model) => null; + } + + [ApiConventionType(typeof(DefaultApiConventions))] + public class GetDeclaredResponseMetadata_ApiConventionTypeAttributeOnBaseTypeBase + { + } + + public class GetDeclaredResponseMetadata_ApiConventionTypeAttributeOnBaseType : GetDeclaredResponseMetadata_ApiConventionTypeAttributeOnBaseTypeBase + { + public IActionResult Post(object model) => null; + } } From 68067b8aca02e7e55fbbf44ea41cabff8e6aed9a Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 2 Jan 2019 11:50:36 -0800 Subject: [PATCH 50/80] Keep Platform targets --- .../AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc | 2 -- .../IIS/src/Microsoft.AspNetCore.Server.IIS.csproj | 3 ++- ....AspNetCore.Server.IntegrationTesting.IIS.csproj | 10 +++++++--- src/Servers/IIS/ResolveIisReferences.targets | 13 +++++++++---- 4 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc 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/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj index fc9e456853..897ebe80cd 100644 --- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj @@ -25,7 +25,8 @@ - + + diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index 90ead7da3a..fad9d07dea 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -27,9 +27,13 @@ - - - + + + + + + + diff --git a/src/Servers/IIS/ResolveIisReferences.targets b/src/Servers/IIS/ResolveIisReferences.targets index b798deed5f..cb4b5ebf1f 100644 --- a/src/Servers/IIS/ResolveIisReferences.targets +++ b/src/Servers/IIS/ResolveIisReferences.targets @@ -10,14 +10,19 @@ with the right MSBuild incantations to get output copied to the right place. - + + - - - + + + + + + + From 7e0d6323d1ecf0ec3df1d6b5ea9132618fa5390e Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 2 Jan 2019 12:06:08 -0800 Subject: [PATCH 51/80] Fix JoinItems namespace collision (#6302) --- build/repo.targets | 4 ++-- build/tasks/{JoinItems.cs => JoinRepoItems.cs} | 2 +- build/tasks/RepoTasks.tasks | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename build/tasks/{JoinItems.cs => JoinRepoItems.cs} (99%) diff --git a/build/repo.targets b/build/repo.targets index 150edb552e..6e4b31e51b 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -168,14 +168,14 @@ - - + <_PackageArtifactWithoutMatchingInfo Include="@(_Temp)" Exclude="@(PackageArtifact)" /> diff --git a/build/tasks/JoinItems.cs b/build/tasks/JoinRepoItems.cs similarity index 99% rename from build/tasks/JoinItems.cs rename to build/tasks/JoinRepoItems.cs index facfd4fa53..97f0ab9d0f 100644 --- a/build/tasks/JoinItems.cs +++ b/build/tasks/JoinRepoItems.cs @@ -10,7 +10,7 @@ using Microsoft.Build.Utilities; namespace RepoTasks { - public class JoinItems : Task + public class JoinRepoItems : Task { [Required] public ITaskItem[] Left { get; set; } diff --git a/build/tasks/RepoTasks.tasks b/build/tasks/RepoTasks.tasks index 17919c3e90..43323cf2e2 100644 --- a/build/tasks/RepoTasks.tasks +++ b/build/tasks/RepoTasks.tasks @@ -6,7 +6,7 @@ - + From d416d22092f976805cd618f830d5cb734ca74eed Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 2 Jan 2019 12:57:06 -0800 Subject: [PATCH 52/80] Native by default (#6165) --- build.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index cf66e3eacd..ed9e96583c 100644 --- a/build.ps1 +++ b/build.ps1 @@ -242,12 +242,13 @@ elseif ($Projects) { else { # When adding new sub-group build flags, add them to this check. if((-not $Native) -and (-not $Managed) -and (-not $NodeJS) -and (-not $Installers)) { - Write-Warning "No default group of projects was specified, so building the 'managed' subset of projects. Run ``build.cmd -help`` for more details." + Write-Warning "No default group of projects was specified, so building the 'managed' and 'native' subsets of projects. Run ``build.cmd -help`` for more details." # This goal of this is to pick a sensible default for `build.cmd` with zero arguments. - # We believe the most common thing our contributors will work on is C#, so if no other build group was picked, build the C# projects. + # Now that we support subfolder invokations of build.cmd, we will be pushing to have build.cmd build everything (-all) by default $Managed = $true + $Native = $true } $MSBuildArguments += "/p:BuildManaged=$Managed" From 6469851a121ccd89594ea6b7307915eb9abf049a Mon Sep 17 00:00:00 2001 From: Hamza Assyad Date: Wed, 2 Jan 2019 13:39:46 -0800 Subject: [PATCH 53/80] Adding Amazon Cognito to the list of supported Identity providers (#6039) --- src/Identity/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Identity/README.md b/src/Identity/README.md index 2d659ad4da..14d2f1eb03 100644 --- a/src/Identity/README.md +++ b/src/Identity/README.md @@ -29,3 +29,4 @@ The previous versions of Identity for MVC5 and lower, previously available on Co * [ASP.NET Identity Firebase Provider](https://github.com/aguacongas/Identity.Firebase) * [ASP.NET Identity Redis Provider](https://github.com/aguacongas/Identity.Redis) * [ASP.NET Identity DocumentDB](https://github.com/FelschR/AspNetCore.Identity.DocumentDB) + * [ASP.NET Identity Amazon Cognito Provider](https://github.com/aws/aws-aspnet-cognito-identity-provider) From 5665d78ffe6c2e414c42548facfe3e6375192f4e Mon Sep 17 00:00:00 2001 From: Mazioudi Anas Date: Wed, 2 Jan 2019 22:41:44 +0100 Subject: [PATCH 54/80] Correct documentation wording (#6220) --- src/Hosting/Hosting/src/WebHostBuilder.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Hosting/Hosting/src/WebHostBuilder.cs b/src/Hosting/Hosting/src/WebHostBuilder.cs index 8c104068d6..f076c91bc4 100644 --- a/src/Hosting/Hosting/src/WebHostBuilder.cs +++ b/src/Hosting/Hosting/src/WebHostBuilder.cs @@ -186,8 +186,8 @@ namespace Microsoft.AspNetCore.Hosting } catch { - // Dispose the host if there's a failure to initialize, this should clean up - // will dispose services that were constructed until the exception was thrown + // Dispose the host if there's a failure to initialize, this should dispose + // services that were constructed until the exception was thrown host.Dispose(); throw; } From 7c2add8ea4d3e40da8152833cc09450518d2f10e Mon Sep 17 00:00:00 2001 From: Shahriar Gholami Date: Thu, 3 Jan 2019 01:31:48 +0330 Subject: [PATCH 55/80] Fix grammar in docs/README.md (#6303) --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 98fe46e403..f055ea32b5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,4 +2,4 @@ Contributor documentation ========================= The primary audience for documentation in this folder is contributors to ASP.NET Core. -If you are looking for documentation on to *use* ASP.NET Core, go to . +If you are looking for documentation on how to *use* ASP.NET Core, go to . From 2d48eeb4796ca14ffbe1c23434f0dccc34b33ccb Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 2 Jan 2019 14:04:42 -0800 Subject: [PATCH 56/80] Feedback --- .../AspNetCore/aspnetcore_schema.xml | 47 ------------------- ...NetCore.Server.IISIntegration.Tests.csproj | 5 +- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml diff --git a/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml b/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml deleted file mode 100644 index d65be07195..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj index 4ba8a5cc4c..bd9cb1acb7 100644 --- a/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj +++ b/src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj @@ -1,14 +1,11 @@  - netcoreapp3.0 + netcoreapp3.0 - - - From 94dd5eff21c2dca51ee25d8bc8dbb9e9db136f71 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 2 Jan 2019 13:38:41 -0800 Subject: [PATCH 57/80] Fix incorrect Debug.Assert statements --- src/Http/WebUtilities/src/HttpResponseStreamWriter.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Http/WebUtilities/src/HttpResponseStreamWriter.cs b/src/Http/WebUtilities/src/HttpResponseStreamWriter.cs index 9e0bf57c92..c5bcdd0aa3 100644 --- a/src/Http/WebUtilities/src/HttpResponseStreamWriter.cs +++ b/src/Http/WebUtilities/src/HttpResponseStreamWriter.cs @@ -210,7 +210,7 @@ namespace Microsoft.AspNetCore.WebUtilities private async Task WriteAsyncAwaited(char[] values, int index, int count) { Debug.Assert(count > 0); - Debug.Assert(_charBufferSize - _charBufferCount > count); + Debug.Assert(_charBufferSize - _charBufferCount < count); while (count > 0) { @@ -220,7 +220,6 @@ namespace Microsoft.AspNetCore.WebUtilities } CopyToCharBuffer(values, ref index, ref count); - Debug.Assert(count == 0); } } From a10aff3a036dabb690ccfa5dad88972fd451ac71 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 2 Jan 2019 14:30:01 -0800 Subject: [PATCH 58/80] Specify correct global.json path for Razor.Design tests (#6311) --- .../IntegrationTests/IntegrationTests/ProjectDirectory.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs index 84b7e2a0c5..d5a5dffb3e 100644 --- a/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs +++ b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs @@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests CopyGlobalJson(solutionRoot, destinationPath); return new ProjectDirectory( - destinationPath, + destinationPath, directoryPath, newProjectFilePath); } @@ -128,7 +128,8 @@ $@" void CopyGlobalJson(string solutionRoot, string projectRoot) { - var srcGlobalJson = Path.Combine(solutionRoot, "global.json"); + var repoRoot = Path.Combine(solutionRoot, "..", ".."); + var srcGlobalJson = Path.Combine(repoRoot, "global.json"); if (!File.Exists(srcGlobalJson)) { throw new InvalidOperationException("global.json at the root of the repository could not be found. Run './build /t:Noop' at the repository root and re-run these tests."); From 0ae6cc8e880ab1a38c0168581a51b947ea97b578 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 2 Jan 2019 15:50:19 -0800 Subject: [PATCH 59/80] Remove InplaceStringBuilder usages (#6163) --- src/Http/Headers/src/HeaderUtilities.cs | 76 ++++++------ src/Http/Headers/src/SetCookieHeaderValue.cs | 109 ++++++++++-------- .../Http/perf/HeaderUtilitiesBenchmark.cs | 24 ++++ .../ViewPath.cs | 24 ++-- .../PageRouteModelFactory.cs | 16 ++- 5 files changed, 148 insertions(+), 101 deletions(-) create mode 100644 src/Http/Http/perf/HeaderUtilitiesBenchmark.cs diff --git a/src/Http/Headers/src/HeaderUtilities.cs b/src/Http/Headers/src/HeaderUtilities.cs index 937e3f7181..0d193b4e61 100644 --- a/src/Http/Headers/src/HeaderUtilities.cs +++ b/src/Http/Headers/src/HeaderUtilities.cs @@ -625,7 +625,7 @@ namespace Microsoft.Net.Http.Headers { input = RemoveQuotes(input); - // First pass to calculate the size of the InplaceStringBuilder + // First pass to calculate the size of the string var backSlashCount = CountBackslashesForDecodingQuotedString(input); if (backSlashCount == 0) @@ -633,26 +633,32 @@ namespace Microsoft.Net.Http.Headers return input; } - var stringBuilder = new InplaceStringBuilder(input.Length - backSlashCount); - - for (var i = 0; i < input.Length; i++) + return string.Create(input.Length - backSlashCount, input, (span, segment) => { - if (i < input.Length - 1 && input[i] == '\\') + var spanIndex = 0; + var spanLength = span.Length; + for (var i = 0; i < segment.Length && (uint)spanIndex < (uint)spanLength; i++) { - // If there is an backslash character as the last character in the string, - // we will assume that it should be included literally in the unescaped string - // Ex: "hello\\" => "hello\\" - // Also, if a sender adds a quoted pair like '\\''n', - // we will assume it is over escaping and just add a n to the string. - // Ex: "he\\llo" => "hello" - stringBuilder.Append(input[i + 1]); - i++; - continue; - } - stringBuilder.Append(input[i]); - } + int nextIndex = i + 1; + if ((uint)nextIndex < (uint)segment.Length && segment[i] == '\\') + { + // If there is an backslash character as the last character in the string, + // we will assume that it should be included literally in the unescaped string + // Ex: "hello\\" => "hello\\" + // Also, if a sender adds a quoted pair like '\\''n', + // we will assume it is over escaping and just add a n to the string. + // Ex: "he\\llo" => "hello" + span[spanIndex] = segment[nextIndex]; + i++; + } + else + { + span[spanIndex] = segment[i]; + } - return stringBuilder.ToString(); + spanIndex++; + } + }); } private static int CountBackslashesForDecodingQuotedString(StringSegment input) @@ -696,25 +702,27 @@ namespace Microsoft.Net.Http.Headers // By calling this, we know that the string requires quotes around it to be a valid token. var backSlashCount = CountAndCheckCharactersNeedingBackslashesWhenEncoding(input); - var stringBuilder = new InplaceStringBuilder(input.Length + backSlashCount + 2); // 2 for quotes - stringBuilder.Append('\"'); + // 2 for quotes + return string.Create(input.Length + backSlashCount + 2, input, (span, segment) => { + // Helps to elide the bounds check for span[0] + span[span.Length - 1] = span[0] = '\"'; - for (var i = 0; i < input.Length; i++) - { - if (input[i] == '\\' || input[i] == '\"') + var spanIndex = 1; + for (var i = 0; i < segment.Length; i++) { - stringBuilder.Append('\\'); + if (segment[i] == '\\' || segment[i] == '\"') + { + span[spanIndex++] = '\\'; + } + else if ((segment[i] <= 0x1F || segment[i] == 0x7F) && segment[i] != 0x09) + { + // Control characters are not allowed in a quoted-string, which include all characters + // below 0x1F (except for 0x09 (TAB)) and 0x7F. + throw new FormatException($"Invalid control character '{segment[i]}' in input."); + } + span[spanIndex++] = segment[i]; } - else if ((input[i] <= 0x1F || input[i] == 0x7F) && input[i] != 0x09) - { - // Control characters are not allowed in a quoted-string, which include all characters - // below 0x1F (except for 0x09 (TAB)) and 0x7F. - throw new FormatException($"Invalid control character '{input[i]}' in input."); - } - stringBuilder.Append(input[i]); - } - stringBuilder.Append('\"'); - return stringBuilder.ToString(); + }); } private static int CountAndCheckCharactersNeedingBackslashesWhenEncoding(StringSegment input) diff --git a/src/Http/Headers/src/SetCookieHeaderValue.cs b/src/Http/Headers/src/SetCookieHeaderValue.cs index 979844613e..8529593486 100644 --- a/src/Http/Headers/src/SetCookieHeaderValue.cs +++ b/src/Http/Headers/src/SetCookieHeaderValue.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Diagnostics.Contracts; using System.Text; using Microsoft.Extensions.Primitives; @@ -24,7 +25,8 @@ namespace Microsoft.Net.Http.Headers private const string HttpOnlyToken = "httponly"; private const string SeparatorToken = "; "; private const string EqualsToken = "="; - private const string DefaultPath = "/"; // TODO: Used? + private const int ExpiresDateLength = 29; + private const string ExpiresDateFormat = "r"; private static readonly HttpHeaderParser SingleValueParser = new GenericHeaderParser(false, GetSetCookieLength); @@ -99,14 +101,11 @@ namespace Microsoft.Net.Http.Headers { var length = _name.Length + EqualsToken.Length + _value.Length; - string expires = null; string maxAge = null; - string sameSite = null; if (Expires.HasValue) { - expires = HeaderUtilities.FormatDate(Expires.GetValueOrDefault()); - length += SeparatorToken.Length + ExpiresToken.Length + EqualsToken.Length + expires.Length; + length += SeparatorToken.Length + ExpiresToken.Length + EqualsToken.Length + ExpiresDateLength; } if (MaxAge.HasValue) @@ -132,7 +131,7 @@ namespace Microsoft.Net.Http.Headers if (SameSite != SameSiteMode.None) { - sameSite = SameSite == SameSiteMode.Lax ? SameSiteLaxToken : SameSiteStrictToken; + var sameSite = SameSite == SameSiteMode.Lax ? SameSiteLaxToken : SameSiteStrictToken; length += SeparatorToken.Length + SameSiteToken.Length + EqualsToken.Length + sameSite.Length; } @@ -141,61 +140,75 @@ namespace Microsoft.Net.Http.Headers length += SeparatorToken.Length + HttpOnlyToken.Length; } - var sb = new InplaceStringBuilder(length); - - sb.Append(_name); - sb.Append(EqualsToken); - sb.Append(_value); - - if (expires != null) + return string.Create(length, (this, maxAge), (span, tuple) => { - AppendSegment(ref sb, ExpiresToken, expires); - } + var (headerValue, maxAgeValue) = tuple; - if (maxAge != null) - { - AppendSegment(ref sb, MaxAgeToken, maxAge); - } + Append(ref span, headerValue._name); + Append(ref span, EqualsToken); + Append(ref span, headerValue._value); - if (Domain != null) - { - AppendSegment(ref sb, DomainToken, Domain); - } + if (headerValue.Expires is DateTimeOffset expiresValue) + { + Append(ref span, SeparatorToken); + Append(ref span, ExpiresToken); + Append(ref span, EqualsToken); - if (Path != null) - { - AppendSegment(ref sb, PathToken, Path); - } + var formatted = expiresValue.TryFormat(span, out var charsWritten, ExpiresDateFormat); + span = span.Slice(charsWritten); - if (Secure) - { - AppendSegment(ref sb, SecureToken, null); - } + Debug.Assert(formatted); + } - if (SameSite != SameSiteMode.None) - { - AppendSegment(ref sb, SameSiteToken, sameSite); - } + if (maxAgeValue != null) + { + AppendSegment(ref span, MaxAgeToken, maxAgeValue); + } - if (HttpOnly) - { - AppendSegment(ref sb, HttpOnlyToken, null); - } + if (headerValue.Domain != null) + { + AppendSegment(ref span, DomainToken, headerValue.Domain); + } - return sb.ToString(); + if (headerValue.Path != null) + { + AppendSegment(ref span, PathToken, headerValue.Path); + } + + if (headerValue.Secure) + { + AppendSegment(ref span, SecureToken, null); + } + + if (headerValue.SameSite != SameSiteMode.None) + { + AppendSegment(ref span, SameSiteToken, headerValue.SameSite == SameSiteMode.Lax ? SameSiteLaxToken : SameSiteStrictToken); + } + + if (headerValue.HttpOnly) + { + AppendSegment(ref span, HttpOnlyToken, null); + } + }); } - private static void AppendSegment(ref InplaceStringBuilder builder, StringSegment name, StringSegment value) + private static void AppendSegment(ref Span span, StringSegment name, StringSegment value) { - builder.Append(SeparatorToken); - builder.Append(name); + Append(ref span, SeparatorToken); + Append(ref span, name.AsSpan()); if (value != null) { - builder.Append(EqualsToken); - builder.Append(value); + Append(ref span, EqualsToken); + Append(ref span, value.AsSpan()); } } + private static void Append(ref Span span, ReadOnlySpan other) + { + other.CopyTo(span); + span = span.Slice(other.Length); + } + /// /// Append string representation of this to given /// . @@ -452,14 +465,14 @@ namespace Microsoft.Net.Http.Headers result.HttpOnly = true; } // extension-av = - else - { + else + { // TODO: skiping it for now to avoid parsing failure? Store it in a list? // = (no spaces) if (!ReadEqualsSign(input, ref offset)) { return 0; - } + } ReadToSemicolonOrEnd(input, ref offset); } } diff --git a/src/Http/Http/perf/HeaderUtilitiesBenchmark.cs b/src/Http/Http/perf/HeaderUtilitiesBenchmark.cs new file mode 100644 index 0000000000..566ae6e987 --- /dev/null +++ b/src/Http/Http/perf/HeaderUtilitiesBenchmark.cs @@ -0,0 +1,24 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using BenchmarkDotNet.Attributes; +using Microsoft.Extensions.Primitives; + +namespace Microsoft.Net.Http.Headers +{ + public class HeaderUtilitiesBenchmark + { + [Benchmark] + public StringSegment UnescapeAsQuotedString() + { + return HeaderUtilities.UnescapeAsQuotedString("\"hello\\\"foo\\\\bar\\\\baz\\\\\""); + } + + [Benchmark] + public StringSegment EscapeAsQuotedString() + { + return HeaderUtilities.EscapeAsQuotedString("\"hello\\\"foo\\\\bar\\\\baz\\\\\""); + } + } +} diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs index 640dc69432..652d74229c 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs @@ -1,8 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.Extensions.Primitives; - namespace Microsoft.AspNetCore.Mvc.Razor { internal static class ViewPath @@ -23,23 +21,21 @@ namespace Microsoft.AspNetCore.Mvc.Razor length++; } - var builder = new InplaceStringBuilder(length); - if (addLeadingSlash) + return string.Create(length, (path, addLeadingSlash), (span, tuple) => { - builder.Append('/'); - } + var (pathValue, addLeadingSlashValue) = tuple; + var spanIndex = 0; - for (var i = 0; i < path.Length; i++) - { - var ch = path[i]; - if (ch == '\\') + if (addLeadingSlashValue) { - ch = '/'; + span[spanIndex++] = '/'; } - builder.Append(ch); - } - return builder.ToString(); + foreach (var ch in pathValue) + { + span[spanIndex++] = ch == '\\' ? '/' : ch; + } + }); } } } diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs index 603a0225dc..b2650063b7 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs @@ -144,12 +144,18 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels Debug.Assert(!string.IsNullOrEmpty(viewEnginePath)); Debug.Assert(viewEnginePath.StartsWith("/", StringComparison.Ordinal)); - var builder = new InplaceStringBuilder(1 + areaName.Length + viewEnginePath.Length); - builder.Append('/'); - builder.Append(areaName); - builder.Append(viewEnginePath); + return string.Create(1 + areaName.Length + viewEnginePath.Length, (areaName, viewEnginePath), (span, tuple) => + { + var (areaNameValue, viewEnginePathValue) = tuple; - return builder.ToString(); + span[0] = '/'; + span = span.Slice(1); + + areaNameValue.AsSpan().CopyTo(span); + span = span.Slice(areaNameValue.Length); + + viewEnginePathValue.AsSpan().CopyTo(span); + }); } private static SelectorModel CreateSelectorModel(string prefix, string routeTemplate) From afb92018f07bf81c7be092ce93ae36cf1aca5365 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Wed, 2 Jan 2019 15:23:50 -0800 Subject: [PATCH 60/80] Produce log output for flakey test. - For the flakey test replaced the default logger with Xunit's `ITestOutputHelper` in order to see what's going wrong when the flakey test will eventually fail. aspnet/AspNetCore-Internal#1337 --- .../HtmlGenerationWithCultureTest.cs | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs index d028f5ec24..d767fbdc12 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs @@ -10,19 +10,28 @@ using AngleSharp.Extensions; using AngleSharp.Html; using HtmlGenerationWebSite; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging.Testing; using Xunit; +using Xunit.Abstractions; using Xunit.Sdk; namespace Microsoft.AspNetCore.Mvc.FunctionalTests { - public class HtmlGenerationWithCultureTest : IClassFixture> + public class HtmlGenerationWithCultureTest : LoggedTest, IClassFixture> { - public HtmlGenerationWithCultureTest(MvcTestFixture fixture) + public HtmlGenerationWithCultureTest( + ITestOutputHelper testOutputHelper, + MvcTestFixture fixture) : base(testOutputHelper) { - var factory = fixture.WithWebHostBuilder(builder => builder.UseStartup()); - Client = factory.CreateDefaultClient(); + Factory = fixture.WithWebHostBuilder(builder => builder.UseStartup()); + Client = Factory.CreateDefaultClient(); } + public WebApplicationFactory Factory { get; } + public HttpClient Client { get; } [Fact] @@ -122,12 +131,17 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests public async Task CacheTagHelper_VaryByCultureComposesWithOtherVaryByOptions() { // Arrange + var client = Factory + .WithWebHostBuilder(builder => builder + .UseStartup() + .ConfigureTestServices(services => services.AddSingleton(LoggerFactory))) + .CreateDefaultClient(); string culture; string correlationId; string cachedCorrelationId; // Act - 1 - var document = await Client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=10"); + var document = await client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=10"); ReadValuesFromDocument(); // Assert - 1 @@ -136,7 +150,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Equal("10", cachedCorrelationId); // Act - 2 - document = await Client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=11&varyByQueryKey=new-key"); + document = await client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=11&varyByQueryKey=new-key"); ReadValuesFromDocument(); // Assert - 2 @@ -146,7 +160,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Equal("11", cachedCorrelationId); // Act - 3 - document = await Client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=14"); + document = await client.GetHtmlDocumentAsync("/CacheTagHelper_VaryByCulture?culture=fr-Fr&correlationId=14"); ReadValuesFromDocument(); // Assert - 3 From 910e5ad7e510ed5f565601c2f864a9c441319069 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 3 Jan 2019 08:54:14 -0800 Subject: [PATCH 61/80] Reference InprocessTestSite in CreateDefaultBuilderApp and Disable Failing Tests (#6318) --- .../CreateDefaultBuilderApp.csproj | 1 + src/Http/Http/test/StreamPipeReaderTests.cs | 2 +- .../test/MusicStore.E2ETests/NtlmAuthentationTest.cs | 2 +- .../test/MusicStore.E2ETests/OpenIdConnectTests.cs | 2 +- .../test/MusicStore.E2ETests/SmokeTests.cs | 12 +----------- src/Servers/test/FunctionalTests/ResponseTests.cs | 2 +- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj b/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj index 26294329a9..c95cdbdc94 100644 --- a/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj +++ b/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj @@ -6,6 +6,7 @@ Exe netcoreapp3.0 aspnetcore-CreateDefaultBuilder-20170424224131 + true diff --git a/src/Http/Http/test/StreamPipeReaderTests.cs b/src/Http/Http/test/StreamPipeReaderTests.cs index 8eb6fcdf91..385b8517f6 100644 --- a/src/Http/Http/test/StreamPipeReaderTests.cs +++ b/src/Http/Http/test/StreamPipeReaderTests.cs @@ -151,7 +151,7 @@ namespace Microsoft.AspNetCore.Http.Tests Assert.NotEqual(readResult, readResult2); } - [Fact] + [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/4621")] public async Task ReadCanBeCancelledViaProvidedCancellationToken() { var pipeReader = new StreamPipeReader(new HangingStream()); diff --git a/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs b/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs index 59d668d09e..9ac91b4855 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, ServerType.HttpSys) + => TestMatrix.ForServers(/*ServerType.IISExpress https://github.com/aspnet/AspNetCore/issues/6170*/ 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 dd47eb8740..23e490715e 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, ServerType.Kestrel) + => TestMatrix.ForServers(/* ServerType.IISExpress https://github.com/aspnet/AspNetCore/issues/6170 */ ServerType.Kestrel) .WithTfms(Tfm.NetCoreApp30); [ConditionalTheory] diff --git a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs index 565a5de89c..066e361a2f 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs @@ -16,24 +16,14 @@ namespace E2ETests public class SmokeTests : LoggedTest { public static TestMatrix TestVariants - => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) + => TestMatrix.ForServers(/* ServerType.IISExpress, https://github.com/aspnet/AspNetCore/issues/6170*/ ServerType.Kestrel, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() .WithAllAncmVersions() .WithAllHostingModels(); - // ANCM In-process cannot run on netcoreapp2.1 and below - public static TestMatrix TestVariantsWithoutInproc - => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) - .WithTfms(Tfm.NetCoreApp30) - .WithAllApplicationTypes() - .WithAllAncmVersions() - .WithHostingModels(HostingModel.OutOfProcess) - .WithAllArchitectures(); - [ConditionalTheory] [MemberData(nameof(TestVariants))] - [MemberData(nameof(TestVariantsWithoutInproc))] public async Task Smoke_Tests(TestVariant variant) { var testName = $"SmokeTestSuite_{variant}"; diff --git a/src/Servers/test/FunctionalTests/ResponseTests.cs b/src/Servers/test/FunctionalTests/ResponseTests.cs index 4eb4b53d51..aed927c017 100644 --- a/src/Servers/test/FunctionalTests/ResponseTests.cs +++ b/src/Servers/test/FunctionalTests/ResponseTests.cs @@ -25,7 +25,7 @@ namespace ServerComparison.FunctionalTests } public static TestMatrix TestVariants - => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys) + => TestMatrix.ForServers(/* ServerType.IISExpress, https://github.com/aspnet/AspNetCore/issues/6168, */ ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) .WithAllAncmVersions() .WithAllHostingModels(); From c2df506894dbeab060eaa29fa8b7b7363e334401 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Thu, 3 Jan 2019 10:18:57 -0800 Subject: [PATCH 62/80] Correct path to IIS Integration project - react to 37291ea114 --- src/Mvc/Mvc.sln | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln index 4b1403c16c..cfe5ef3a73 100644 --- a/src/Mvc/Mvc.sln +++ b/src/Mvc/Mvc.sln @@ -224,8 +224,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hostin EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions", "..\Http\Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj", "{8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{AED237FC-AB90-4C0F-88C2-C20964D7651E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{C185A2B1-64C0-491B-9AAE-382C24F9B4AE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{B37FF37D-0A47-494A-B5ED-497F273B9067}" @@ -270,6 +268,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataPr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "..\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj", "{11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{35AE5599-AD99-4198-AC91-C599459E9023}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1300,18 +1300,6 @@ Global {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|x86.ActiveCfg = Release|Any CPU {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|x86.Build.0 = Release|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|x86.ActiveCfg = Debug|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Debug|x86.Build.0 = Debug|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|Any CPU.Build.0 = Release|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|x86.ActiveCfg = Release|Any CPU - {AED237FC-AB90-4C0F-88C2-C20964D7651E}.Release|x86.Build.0 = Release|Any CPU {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Any CPU.Build.0 = Debug|Any CPU {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -1576,6 +1564,18 @@ Global {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|Mixed Platforms.Build.0 = Release|Any CPU {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|x86.ActiveCfg = Release|Any CPU {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|x86.Build.0 = Release|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|Any CPU.Build.0 = Debug|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|x86.ActiveCfg = Debug|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|x86.Build.0 = Debug|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Release|Any CPU.ActiveCfg = Release|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Release|Any CPU.Build.0 = Release|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Release|x86.ActiveCfg = Release|Any CPU + {35AE5599-AD99-4198-AC91-C599459E9023}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1670,7 +1670,6 @@ Global {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} {CC2FF678-438C-4343-A1A7-BF3E75470EB9} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} - {AED237FC-AB90-4C0F-88C2-C20964D7651E} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} {C185A2B1-64C0-491B-9AAE-382C24F9B4AE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} {B37FF37D-0A47-494A-B5ED-497F273B9067} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} {22F657F5-7D95-438A-985A-A390938E7843} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} @@ -1693,6 +1692,7 @@ Global {848E2620-EAF9-4BFD-8810-4AF71E09A8FB} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} {C75C6E51-4FFD-4902-8739-9109E51875B4} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} + {35AE5599-AD99-4198-AC91-C599459E9023} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {63D344F6-F86D-40E6-85B9-0AABBE338C4A} From be7dfa30af9d33010805cb54b470e8753f7c1fa5 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Thu, 3 Jan 2019 11:02:07 -0800 Subject: [PATCH 63/80] Use InputFormatterException for another case (#6316) - #4917 nits: - test `ExceptionPolicy` logic in an input formatter - remove old Mono workarounds in `SerializaterErrorTests` - fix typo in `SerializableErrorTests` (not using theory data) --- .../XmlSerializerInputFormatter.cs | 14 ++- .../Binders/BodyModelBinderTests.cs | 2 - .../SerializableErrorTests.cs | 109 ++++++++++++------ 3 files changed, 88 insertions(+), 37 deletions(-) diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs index 729d9e1117..336cea13a7 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs @@ -159,9 +159,19 @@ namespace Microsoft.AspNetCore.Mvc.Formatters } // XmlSerializer wraps actual exceptions (like FormatException or XmlException) into an InvalidOperationException // https://github.com/dotnet/corefx/blob/master/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs#L652 - catch (InvalidOperationException exception) when (exception.InnerException is FormatException || exception.InnerException is XmlException) + catch (InvalidOperationException exception) when (exception.InnerException != null && + exception.InnerException.InnerException == null && + string.Equals("Microsoft.GeneratedCode", exception.InnerException.Source, StringComparison.InvariantCulture)) { - throw new InputFormatterException(Resources.ErrorDeserializingInputData, exception); + // Know this was an XML parsing error because the inner Exception was thrown in the (generated) + // assembly the XmlSerializer uses for parsing. The problem did not arise lower in the stack i.e. it's + // not (for example) an out-of-memory condition. + throw new InputFormatterException(Resources.ErrorDeserializingInputData, exception.InnerException); + } + catch (InvalidOperationException exception) when (exception.InnerException is FormatException || + exception.InnerException is XmlException) + { + throw new InputFormatterException(Resources.ErrorDeserializingInputData, exception.InnerException); } } diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs index 0817b368ba..6567e08b45 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs @@ -839,8 +839,6 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders _throwNonInputFormatterException = throwNonInputFormatterException; } - public override InputFormatterExceptionPolicy ExceptionPolicy => InputFormatterExceptionPolicy.AllExceptions; - public override Task ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding) { if (_throwNonInputFormatterException) diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs index 7f073ee9a3..cf4220ab60 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs @@ -7,8 +7,6 @@ using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Formatters.Xml; -using Microsoft.AspNetCore.Testing; -using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Mvc.FunctionalTests @@ -22,22 +20,15 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests public HttpClient Client { get; } - public static TheoryData AcceptHeadersData + public static TheoryData AcceptHeadersData { get { - var data = new TheoryData + return new TheoryData { + "application/xml-dcs", "application/xml-xmlser" }; - - // Mono issue - https://github.com/aspnet/External/issues/18 - if (!TestPlatformHelper.IsMono) - { - data.Add("application/xml-dcs"); - } - - return data; } } @@ -62,19 +53,16 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests XmlAssert.Equal(expectedXml, responseData); } - [ConditionalTheory] - // Mono issue - https://github.com/aspnet/External/issues/18 - // XmlSerializer test is disabled Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. - // This is fixed in mono 4.3.0. - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] - [InlineData("application/xml-xmlser")] - [InlineData("application/xml-dcs")] + [Theory] + [MemberData(nameof(AcceptHeadersData))] public async Task PostedSerializableError_IsBound(string acceptHeader) { // Arrange var expectedXml = "key1-errorThe input was not valid."; - var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/SerializableError/LogErrors"); - request.Content = new StringContent(expectedXml, Encoding.UTF8, acceptHeader); + var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/SerializableError/LogErrors") + { + Content = new StringContent(expectedXml, Encoding.UTF8, acceptHeader) + }; request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptHeader)); // Act @@ -89,25 +77,80 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests XmlAssert.Equal(expectedXml, responseData); } - [ConditionalTheory] - // Mono issue - https://github.com/aspnet/External/issues/18 - // XmlSerializer test is disabled Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. - // This is fixed in mono 4.3.0. - [FrameworkSkipCondition(RuntimeFrameworks.Mono)] - [InlineData("application/xml-xmlser")] - [InlineData("application/xml-dcs")] - public async Task IsReturnedInExpectedFormat(string acceptHeader) + public static TheoryData InvalidInputAndHeadersData + { + get + { + return new TheoryData + { + { + "application/xml-dcs", + "" + + "" + + "2foo" + }, + { + "application/xml-xmlser", + "" + + "" + + "2foo" + }, + }; + } + } + + [Theory] + [MemberData(nameof(InvalidInputAndHeadersData))] + public async Task IsReturnedInExpectedFormat(string acceptHeader, string inputXml) { // Arrange - var input = "" + - "" + - "2foo"; var expected = "The field Id must be between 10 and 100." + "The field Name must be a string or array type with a minimum " + "length of '15'."; var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/SerializableError/CreateEmployee"); request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(acceptHeader)); - request.Content = new StringContent(input, Encoding.UTF8, "application/xml-dcs"); + request.Content = new StringContent(inputXml, Encoding.UTF8, acceptHeader); + + // Act + var response = await Client.SendAsync(request); + + // Assert + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + var responseData = await response.Content.ReadAsStringAsync(); + XmlAssert.Equal(expected, responseData); + } + + public static TheoryData IncorrectTopLevelInputAndHeadersData + { + get + { + return new TheoryData + { + { + "application/xml-dcs", + "" + + "" + + "2foo" + }, + { + "application/xml-xmlser", + "" + + "" + + "2foo" + }, + }; + } + } + + [Theory] + [MemberData(nameof(IncorrectTopLevelInputAndHeadersData))] + public async Task IncorrectTopLevelElement_ReturnsExpectedError(string acceptHeader, string inputXml) + { + // Arrange + var expected = "An error occurred while deserializing input data."; + var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/SerializableError/CreateEmployee"); + request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(acceptHeader)); + request.Content = new StringContent(inputXml, Encoding.UTF8, acceptHeader); // Act var response = await Client.SendAsync(request); From b1f778bfb887f5c8282f5de42302c3f5736da790 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Thu, 3 Jan 2019 15:03:00 -0800 Subject: [PATCH 64/80] [Kestrel] Allow HTTP/2 stream drain timeout during trailers (#4070) - Move all HTTP/2 stream state management into request parsing loop --- .../src/Internal/Http2/Http2Connection.cs | 440 +++++++++--------- .../Internal/Http2/Http2ConnectionState.cs | 12 - .../src/Internal/Http2/Http2FrameWriter.cs | 5 + .../Core/src/Internal/Http2/Http2Stream.cs | 6 +- .../Http2/IHttp2StreamLifetimeHandler.cs | 2 +- .../Core/src/Internal/HttpConnection.cs | 2 +- .../Core/src/Internal/IRequestProcessor.cs | 2 +- .../FunctionalTests/Http2/ShutdownTests.cs | 6 +- .../Http2/Http2ConnectionTests.cs | 8 +- .../Http2/Http2StreamTests.cs | 6 +- .../Http2/Http2TestBase.cs | 17 +- .../Http2/Http2TimeoutTests.cs | 30 +- 12 files changed, 283 insertions(+), 253 deletions(-) delete mode 100644 src/Servers/Kestrel/Core/src/Internal/Http2/Http2ConnectionState.cs diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs index 9a043b7036..2dded1c2d1 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs @@ -4,9 +4,11 @@ using System; using System.Buffers; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.IO.Pipelines; +using System.Runtime.CompilerServices; using System.Security.Authentication; using System.Text; using System.Threading; @@ -26,26 +28,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 { public class Http2Connection : IHttp2StreamLifetimeHandler, IHttpHeadersHandler, IRequestProcessor { - private enum RequestHeaderParsingState - { - Ready, - PseudoHeaderFields, - Headers, - Trailers - } - - [Flags] - private enum PseudoHeaderFields - { - None = 0x0, - Authority = 0x1, - Method = 0x2, - Path = 0x4, - Scheme = 0x8, - Status = 0x10, - Unknown = 0x40000000 - } - public static byte[] ClientPreface { get; } = Encoding.ASCII.GetBytes("PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"); private static readonly PseudoHeaderFields _mandatoryRequestPseudoHeaderFields = @@ -78,15 +60,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 private Http2HeadersFrameFlags _headerFlags; private int _totalParsedHeaderSize; private bool _isMethodConnect; - private readonly object _stateLock = new object(); private int _highestOpenedStreamId; - private Http2ConnectionState _state = Http2ConnectionState.Open; - private readonly TaskCompletionSource _streamsCompleted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + private bool _gracefulCloseStarted; - private readonly ConcurrentDictionary _streams = new ConcurrentDictionary(); - private readonly ConcurrentDictionary _drainingStreams = new ConcurrentDictionary(); + private readonly Dictionary _streams = new Dictionary(); private int _activeStreamCount = 0; + // The following are the only fields that can be modified outside of the ProcessRequestsAsync loop. + private readonly ConcurrentQueue _completedStreams = new ConcurrentQueue(); + private readonly StreamCloseAwaitable _streamCompletionAwaitable = new StreamCloseAwaitable(); + private int _gracefulCloseInitiator; + private int _isClosed; + public Http2Connection(HttpConnectionContext context) { var httpLimits = context.ServiceContext.ServerOptions.Limits; @@ -120,6 +105,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 public PipeReader Input => _context.Transport.Input; public IKestrelTrace Log => _context.ServiceContext.Log; public IFeatureCollection ConnectionFeatures => _context.ConnectionFeatures; + public ISystemClock SystemClock => _context.ServiceContext.SystemClock; public ITimeoutControl TimeoutControl => _context.TimeoutControl; public KestrelServerLimits Limits => _context.ServiceContext.ServerOptions.Limits; @@ -127,33 +113,22 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 public void OnInputOrOutputCompleted() { - lock (_stateLock) - { - if (_state != Http2ConnectionState.Closed) - { - UpdateState(Http2ConnectionState.Closed); - } - } - + TryClose(); _frameWriter.Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedByClient)); } public void Abort(ConnectionAbortedException ex) { - lock (_stateLock) + if (TryClose()) { - if (_state != Http2ConnectionState.Closed) - { - _frameWriter.WriteGoAwayAsync(_highestOpenedStreamId, Http2ErrorCode.INTERNAL_ERROR); - UpdateState(Http2ConnectionState.Closed); - } + _frameWriter.WriteGoAwayAsync(int.MaxValue, Http2ErrorCode.INTERNAL_ERROR); } _frameWriter.Abort(ex); } public void StopProcessingNextRequest() - => StopProcessingNextRequest(true); + => StopProcessingNextRequest(serverInitiated: true); public void HandleRequestHeadersTimeout() { @@ -167,30 +142,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 Abort(new ConnectionAbortedException(CoreStrings.BadRequest_RequestBodyTimeout)); } - public void StopProcessingNextRequest(bool sendGracefulGoAway = false) + public void StopProcessingNextRequest(bool serverInitiated) { - lock (_stateLock) + var initiator = serverInitiated ? GracefulCloseInitiator.Server : GracefulCloseInitiator.Client; + + if (Interlocked.CompareExchange(ref _gracefulCloseInitiator, initiator, GracefulCloseInitiator.None) == GracefulCloseInitiator.None) { - if (_state == Http2ConnectionState.Open) - { - if (_activeStreamCount == 0) - { - _frameWriter.WriteGoAwayAsync(_highestOpenedStreamId, Http2ErrorCode.NO_ERROR); - UpdateState(Http2ConnectionState.Closed); - - // Wake up request processing loop so the connection can complete if there are no pending requests - Input.CancelPendingRead(); - } - else - { - if (sendGracefulGoAway) - { - _frameWriter.WriteGoAwayAsync(Int32.MaxValue, Http2ErrorCode.NO_ERROR); - } - - UpdateState(Http2ConnectionState.Closing); - } - } + Input.CancelPendingRead(); } } @@ -211,7 +169,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 return; } - if (_state != Http2ConnectionState.Closed) + if (_isClosed == 0) { await _frameWriter.WriteSettingsAsync(_serverSettings.GetNonProtocolDefaults()); // Inform the client that the connection window is larger than the default. It can't be lowered here, @@ -224,13 +182,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 } } - while (_state != Http2ConnectionState.Closed) + while (_isClosed == 0) { var result = await Input.ReadAsync(); var readableBuffer = result.Buffer; var consumed = readableBuffer.Start; var examined = readableBuffer.Start; + // Call UpdateCompletedStreams() prior to frame processing in order to remove any streams that have exceded their drain timeouts. + UpdateCompletedStreams(); + try { if (!readableBuffer.IsEmpty) @@ -262,6 +223,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 finally { Input.AdvanceTo(consumed, examined); + + UpdateConnectionState(); } } } @@ -305,18 +268,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 try { - lock (_stateLock) + if (TryClose()) { - if (_state != Http2ConnectionState.Closed) - { - _frameWriter.WriteGoAwayAsync(_highestOpenedStreamId, errorCode); - UpdateState(Http2ConnectionState.Closed); - } - - if (_activeStreamCount == 0) - { - _streamsCompleted.TrySetResult(null); - } + await _frameWriter.WriteGoAwayAsync(_highestOpenedStreamId, errorCode); } // Ensure aborting each stream doesn't result in unnecessary WINDOW_UPDATE frames being sent. @@ -327,8 +281,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 stream.Abort(new IOException(CoreStrings.Http2StreamAborted, connectionError)); } - await _streamsCompleted.Task; + while (_activeStreamCount > 0) + { + await _streamCompletionAwaitable; + UpdateCompletedStreams(); + } + // This cancels keep-alive and request header timeouts, but not the response drain timeout. + TimeoutControl.CancelTimeout(); TimeoutControl.StartDrainTimeout(Limits.MinResponseDataRate, Limits.MaxResponseBufferSize); _frameWriter.Complete(); @@ -364,7 +324,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 private async Task TryReadPrefaceAsync() { - while (_state != Http2ConnectionState.Closed) + while (_isClosed == 0) { var result = await Input.ReadAsync(); var readableBuffer = result.Buffer; @@ -389,6 +349,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 finally { Input.AdvanceTo(consumed, examined); + + UpdateConnectionState(); } } @@ -498,12 +460,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 throw new Http2ConnectionErrorException(CoreStrings.FormatHttp2ErrorStreamHalfClosedRemote(_incomingFrame.Type, stream.StreamId), Http2ErrorCode.STREAM_CLOSED); } - if (_incomingFrame.DataEndStream && stream.IsDraining) - { - // No more frames expected. - RemoveDrainingStream(_incomingFrame.StreamId); - } - return stream.OnDataAsync(_incomingFrame, payload); } @@ -589,46 +545,42 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 } else { - // Cancel keep-alive timeout and start header timeout if necessary. The keep-alive timeout can be - // started on another thread so the lock is necessary. - lock (_stateLock) + // Cancel keep-alive timeout and start header timeout if necessary. + if (TimeoutControl.TimerReason != TimeoutReason.None) { - if (TimeoutControl.TimerReason != TimeoutReason.None) - { - Debug.Assert(TimeoutControl.TimerReason == TimeoutReason.KeepAlive, "Non keep-alive timeout set at start of stream."); - TimeoutControl.CancelTimeout(); - } - - if (!_incomingFrame.HeadersEndHeaders) - { - TimeoutControl.SetTimeout(Limits.RequestHeadersTimeout.Ticks, TimeoutReason.RequestHeaders); - } - - // Start a new stream - _currentHeadersStream = new Http2Stream(new Http2StreamContext - { - ConnectionId = ConnectionId, - StreamId = _incomingFrame.StreamId, - ServiceContext = _context.ServiceContext, - ConnectionFeatures = _context.ConnectionFeatures, - MemoryPool = _context.MemoryPool, - LocalEndPoint = _context.LocalEndPoint, - RemoteEndPoint = _context.RemoteEndPoint, - StreamLifetimeHandler = this, - ClientPeerSettings = _clientSettings, - ServerPeerSettings = _serverSettings, - FrameWriter = _frameWriter, - ConnectionInputFlowControl = _inputFlowControl, - ConnectionOutputFlowControl = _outputFlowControl, - TimeoutControl = TimeoutControl, - }); - - _currentHeadersStream.Reset(); - _headerFlags = _incomingFrame.HeadersFlags; - - var headersPayload = payload.Slice(0, _incomingFrame.HeadersPayloadLength); // Minus padding - return DecodeHeadersAsync(application, _incomingFrame.HeadersEndHeaders, headersPayload); + Debug.Assert(TimeoutControl.TimerReason == TimeoutReason.KeepAlive, "Non keep-alive timeout set at start of stream."); + TimeoutControl.CancelTimeout(); } + + if (!_incomingFrame.HeadersEndHeaders) + { + TimeoutControl.SetTimeout(Limits.RequestHeadersTimeout.Ticks, TimeoutReason.RequestHeaders); + } + + // Start a new stream + _currentHeadersStream = new Http2Stream(new Http2StreamContext + { + ConnectionId = ConnectionId, + StreamId = _incomingFrame.StreamId, + ServiceContext = _context.ServiceContext, + ConnectionFeatures = _context.ConnectionFeatures, + MemoryPool = _context.MemoryPool, + LocalEndPoint = _context.LocalEndPoint, + RemoteEndPoint = _context.RemoteEndPoint, + StreamLifetimeHandler = this, + ClientPeerSettings = _clientSettings, + ServerPeerSettings = _serverSettings, + FrameWriter = _frameWriter, + ConnectionInputFlowControl = _inputFlowControl, + ConnectionOutputFlowControl = _outputFlowControl, + TimeoutControl = TimeoutControl, + }); + + _currentHeadersStream.Reset(); + _headerFlags = _incomingFrame.HeadersFlags; + + var headersPayload = payload.Slice(0, _incomingFrame.HeadersPayloadLength); // Minus padding + return DecodeHeadersAsync(application, _incomingFrame.HeadersEndHeaders, headersPayload); } } @@ -685,16 +637,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 throw new Http2ConnectionErrorException(CoreStrings.FormatHttp2ErrorStreamAborted(_incomingFrame.Type, stream.StreamId), Http2ErrorCode.STREAM_CLOSED); } - if (stream.IsDraining) - { - // This stream was aborted by the server earlier and now the client is aborting it as well. No more frames are expected. - RemoveDrainingStream(_incomingFrame.StreamId); - } - else - { - // No additional inbound header or data frames are allowed for this stream after receiving a reset. - stream.AbortRstStreamReceived(); - } + // No additional inbound header or data frames are allowed for this stream after receiving a reset. + stream.AbortRstStreamReceived(); } return Task.CompletedTask; @@ -809,7 +753,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 throw new Http2ConnectionErrorException(CoreStrings.FormatHttp2ErrorStreamIdNotZero(_incomingFrame.Type), Http2ErrorCode.PROTOCOL_ERROR); } - StopProcessingNextRequest(sendGracefulGoAway: false); + StopProcessingNextRequest(serverInitiated: false); return Task.CompletedTask; } @@ -896,17 +840,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 } else { - lock (_stateLock) + Debug.Assert(TimeoutControl.TimerReason == TimeoutReason.RequestHeaders, "Received continuation frame without request header timeout being set."); + + if (_incomingFrame.HeadersEndHeaders) { - Debug.Assert(TimeoutControl.TimerReason == TimeoutReason.RequestHeaders, "Received continuation frame without request header timeout being set."); - - if (_incomingFrame.HeadersEndHeaders) - { - TimeoutControl.CancelTimeout(); - } - - return DecodeHeadersAsync(application, _incomingFrame.ContinuationEndHeaders, payload); + TimeoutControl.CancelTimeout(); } + + return DecodeHeadersAsync(application, _incomingFrame.ContinuationEndHeaders, payload); } } @@ -920,7 +861,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 return Task.CompletedTask; } - // This is always called with the _stateLock acquired. private Task DecodeHeadersAsync(IHttpApplication application, bool endHeaders, ReadOnlySequence payload) { try @@ -930,11 +870,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 if (endHeaders) { - if (_state != Http2ConnectionState.Closed) - { - StartStream(application); - } - + StartStream(application); ResetRequestHeaderParsingState(); } } @@ -953,16 +889,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 if (endHeaders) { - if (_currentHeadersStream.IsDraining) - { - // This stream is aborted and abandon, no action required - RemoveDrainingStream(_currentHeadersStream.StreamId); - } - else - { - _currentHeadersStream.OnEndStreamReceived(); - } - + _currentHeadersStream.OnEndStreamReceived(); ResetRequestHeaderParsingState(); } @@ -1041,64 +968,100 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 } } - void IHttp2StreamLifetimeHandler.OnStreamCompleted(int streamId) + void IRequestProcessor.Tick(DateTimeOffset now) { - lock (_stateLock) + Input.CancelPendingRead(); + } + + void IHttp2StreamLifetimeHandler.OnStreamCompleted(Http2Stream stream) + { + _completedStreams.Enqueue(stream); + _streamCompletionAwaitable.Complete(); + } + + private void UpdateCompletedStreams() + { + Http2Stream firstRequedStream = null; + var now = SystemClock.UtcNowTicks; + + while (_completedStreams.TryDequeue(out var stream)) { - _activeStreamCount--; - - // Get, Add, Remove so the steam is always registered in at least one collection at a time. - if (_streams.TryGetValue(streamId, out var stream)) + if (stream == firstRequedStream) { - if (stream.IsDraining) - { - stream.DrainExpirationTicks = - _context.ServiceContext.SystemClock.UtcNowTicks + Constants.RequestBodyDrainTimeout.Ticks; - - _drainingStreams.TryAdd(streamId, stream); - } - else - { - _streams.TryRemove(streamId, out _); - } + // We've checked every stream that was in _completedStreams by the time + // _checkCompletedStreams was unset, so exit the loop. + _completedStreams.Enqueue(stream); + break; } - if (_activeStreamCount == 0) + if (stream.DrainExpirationTicks == default) { - if (_state == Http2ConnectionState.Closing) - { - _frameWriter.WriteGoAwayAsync(_highestOpenedStreamId, Http2ErrorCode.NO_ERROR); - UpdateState(Http2ConnectionState.Closed); + // This is our first time checking this stream. + _activeStreamCount--; + stream.DrainExpirationTicks = now + Constants.RequestBodyDrainTimeout.Ticks; + } - // Wake up request processing loop so the connection can complete if there are no pending requests - Input.CancelPendingRead(); + if (stream.EndStreamReceived || stream.RstStreamReceived || stream.DrainExpirationTicks < now) + { + if (stream == _currentHeadersStream) + { + // The drain expired out while receiving trailers. The most recent incoming frame is either a header or continuation frame for the timed out stream. + throw new Http2ConnectionErrorException(CoreStrings.FormatHttp2ErrorStreamClosed(_incomingFrame.Type, _incomingFrame.StreamId), Http2ErrorCode.STREAM_CLOSED); } - if (_state == Http2ConnectionState.Open) + _streams.Remove(stream.StreamId); + } + else + { + if (firstRequedStream == null) { - // If we're awaiting headers, either a new stream will be started, or there will be a connection - // error possibly due to a request header timeout, so no need to start a keep-alive timeout. - if (TimeoutControl.TimerReason != TimeoutReason.RequestHeaders) - { - TimeoutControl.SetTimeout(Limits.KeepAliveTimeout.Ticks, TimeoutReason.KeepAlive); - } - } - else - { - // Complete the task waiting on all streams to finish - _streamsCompleted.TrySetResult(null); + firstRequedStream = stream; } + + _completedStreams.Enqueue(stream); } } } - void IRequestProcessor.Tick(DateTimeOffset now) + private void UpdateConnectionState() { - foreach (var stream in _drainingStreams) + if (_isClosed != 0) { - if (now.Ticks > stream.Value.DrainExpirationTicks) + return; + } + + if (_gracefulCloseInitiator != GracefulCloseInitiator.None && !_gracefulCloseStarted) + { + _gracefulCloseStarted = true; + + Log.Http2ConnectionClosing(_context.ConnectionId); + + if (_gracefulCloseInitiator == GracefulCloseInitiator.Server && _activeStreamCount > 0) { - RemoveDrainingStream(stream.Key); + _frameWriter.WriteGoAwayAsync(int.MaxValue, Http2ErrorCode.NO_ERROR); + } + } + + if (_activeStreamCount == 0) + { + if (_gracefulCloseStarted) + { + if (TryClose()) + { + _frameWriter.WriteGoAwayAsync(_highestOpenedStreamId, Http2ErrorCode.NO_ERROR); + } + } + else + { + if (TimeoutControl.TimerReason == TimeoutReason.None) + { + TimeoutControl.SetTimeout(Limits.KeepAliveTimeout.Ticks, TimeoutReason.KeepAlive); + } + + // If we're awaiting headers, either a new stream will be started, or there will be a connection + // error possibly due to a request header timeout, so no need to start a keep-alive timeout. + Debug.Assert(TimeoutControl.TimerReason == TimeoutReason.RequestHeaders || + TimeoutControl.TimerReason == TimeoutReason.KeepAlive); } } } @@ -1270,29 +1233,80 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 return name.SequenceEqual(_connectionBytes) || (name.SequenceEqual(_teBytes) && !value.SequenceEqual(_trailersBytes)); } - private void UpdateState(Http2ConnectionState state) + private bool TryClose() { - _state = state; - if (state == Http2ConnectionState.Closing) + if (Interlocked.Exchange(ref _isClosed, 1) == 0) { - Log.Http2ConnectionClosing(_context.ConnectionId); - } - else if (state == Http2ConnectionState.Closed) - { - // This cancels keep-alive and request header timeouts, but not the response drain timeout. - TimeoutControl.CancelTimeout(); Log.Http2ConnectionClosed(_context.ConnectionId, _highestOpenedStreamId); + return true; + } + + return false; + } + + private class StreamCloseAwaitable : ICriticalNotifyCompletion + { + private static readonly Action _callbackCompleted = () => { }; + + // Initialize to completed so UpdateCompletedStreams runs at least once during connection teardown + // if there are still active streams. + private Action _callback = _callbackCompleted; + + public StreamCloseAwaitable GetAwaiter() => this; + public bool IsCompleted => ReferenceEquals(_callback, _callbackCompleted); + + public void GetResult() + { + Debug.Assert(ReferenceEquals(_callback, _callbackCompleted)); + + _callback = null; + } + + public void OnCompleted(Action continuation) + { + if (ReferenceEquals(_callback, _callbackCompleted) || + ReferenceEquals(Interlocked.CompareExchange(ref _callback, continuation, null), _callbackCompleted)) + { + Task.Run(continuation); + } + } + + public void UnsafeOnCompleted(Action continuation) + { + OnCompleted(continuation); + } + + public void Complete() + { + Interlocked.Exchange(ref _callback, _callbackCompleted)?.Invoke(); } } - // Note this may be called concurrently based on incoming frames and Ticks. - private void RemoveDrainingStream(int key) + private enum RequestHeaderParsingState { - _streams.TryRemove(key, out _); - // It's possible to be marked as draining and have RemoveDrainingStream called - // before being added to the draining collection. In that case the next Tick would - // remove it anyways. - _drainingStreams.TryRemove(key, out _); + Ready, + PseudoHeaderFields, + Headers, + Trailers + } + + [Flags] + private enum PseudoHeaderFields + { + None = 0x0, + Authority = 0x1, + Method = 0x2, + Path = 0x4, + Scheme = 0x8, + Status = 0x10, + Unknown = 0x40000000 + } + + private static class GracefulCloseInitiator + { + public const int None = 0; + public const int Server = 1; + public const int Client = 2; } } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2ConnectionState.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2ConnectionState.cs deleted file mode 100644 index cb1518807d..0000000000 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2ConnectionState.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 -{ - public enum Http2ConnectionState - { - Open = 0, - Closing, - Closed - } -} diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs index e8e3ccaf0c..2f67445b27 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs @@ -529,6 +529,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 { lock (_writeLock) { + if (_completed) + { + return Task.CompletedTask; + } + _outgoingFrame.PrepareGoAway(lastStreamId, errorCode); WriteHeaderUnsynchronized(); diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs index da9bbc9dfe..c51dfcf84c 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs @@ -66,7 +66,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 public bool EndStreamReceived => (_completionState & StreamCompletionFlags.EndStreamReceived) == StreamCompletionFlags.EndStreamReceived; private bool IsAborted => (_completionState & StreamCompletionFlags.Aborted) == StreamCompletionFlags.Aborted; internal bool RstStreamReceived => (_completionState & StreamCompletionFlags.RstStreamReceived) == StreamCompletionFlags.RstStreamReceived; - internal bool IsDraining => (_completionState & StreamCompletionFlags.Draining) == StreamCompletionFlags.Draining; public bool ReceivedEmptyRequestBody { @@ -94,8 +93,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 { Log.RequestBodyNotEntirelyRead(ConnectionIdFeature, TraceIdentifier); - ApplyCompletionFlag(StreamCompletionFlags.Draining); - var states = ApplyCompletionFlag(StreamCompletionFlags.Aborted); if (states.OldState != states.NewState) { @@ -117,7 +114,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 } finally { - _context.StreamLifetimeHandler.OnStreamCompleted(StreamId); + _context.StreamLifetimeHandler.OnStreamCompleted(this); } } @@ -509,7 +506,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 RstStreamReceived = 1, EndStreamReceived = 2, Aborted = 4, - Draining = 8, } } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/IHttp2StreamLifetimeHandler.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/IHttp2StreamLifetimeHandler.cs index fcb9c89637..b81b6ca5aa 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/IHttp2StreamLifetimeHandler.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/IHttp2StreamLifetimeHandler.cs @@ -5,6 +5,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 { public interface IHttp2StreamLifetimeHandler { - void OnStreamCompleted(int streamId); + void OnStreamCompleted(Http2Stream stream); } } diff --git a/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs b/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs index 1fdd228fc7..63a926585a 100644 --- a/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; diff --git a/src/Servers/Kestrel/Core/src/Internal/IRequestProcessor.cs b/src/Servers/Kestrel/Core/src/Internal/IRequestProcessor.cs index 7e8e12a964..9f886de64d 100644 --- a/src/Servers/Kestrel/Core/src/Internal/IRequestProcessor.cs +++ b/src/Servers/Kestrel/Core/src/Internal/IRequestProcessor.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs index cb7c5a1ee4..230931cd77 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs @@ -56,13 +56,17 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2 .Setup(m => m.Http2ConnectionClosing(It.IsAny())) .Callback(() => requestStopping.SetResult(null)); + var testContext = new TestServiceContext(LoggerFactory, mockKestrelTrace.Object); + + testContext.InitializeHeartbeat(); + using (var server = new TestServer(async context => { requestStarted.SetResult(null); await requestUnblocked.Task.DefaultTimeout(); await context.Response.WriteAsync("hello world " + context.Request.Protocol); }, - new TestServiceContext(LoggerFactory, mockKestrelTrace.Object), + testContext, kestrelOptions => { kestrelOptions.Listen(IPAddress.Loopback, 0, listenOptions => diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs index 08236ac973..8d3c91b8f2 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs @@ -2678,6 +2678,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { await InitializeConnectionAsync(_echoApplication); + StartHeartbeat(); + // Start some streams await StartStreamAsync(1, _browserRequestHeaders, endStream: false); await StartStreamAsync(3, _browserRequestHeaders, endStream: false); @@ -3559,7 +3561,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests _connection.Abort(new ConnectionAbortedException()); await _closedStateReached.Task.DefaultTimeout(); - VerifyGoAway(await ReceiveFrameAsync(), 0, Http2ErrorCode.INTERNAL_ERROR); + VerifyGoAway(await ReceiveFrameAsync(), int.MaxValue, Http2ErrorCode.INTERNAL_ERROR); } [Fact] @@ -3627,6 +3629,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { await InitializeConnectionAsync(_echoApplication); + StartHeartbeat(); + await StartStreamAsync(1, _browserRequestHeaders, endStream: false); _connection.StopProcessingNextRequest(); @@ -3657,6 +3661,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { await InitializeConnectionAsync(_echoApplication); + StartHeartbeat(); + await StartStreamAsync(1, _browserRequestHeaders, endStream: false); _connection.StopProcessingNextRequest(); diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs index 8375561f9b..9225795d1c 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -1567,7 +1567,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests withFlags: (byte)Http2DataFrameFlags.NONE, withStreamId: 0); - VerifyGoAway(goAway, 1, Http2ErrorCode.INTERNAL_ERROR); + VerifyGoAway(goAway, int.MaxValue, Http2ErrorCode.INTERNAL_ERROR); _pair.Application.Output.Complete(); await _connectionTask; @@ -1995,7 +1995,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests _pair.Application.Output.Complete(); - await WaitForConnectionErrorAsync(ignoreNonGoAwayFrames: false, expectedLastStreamId: 1, Http2ErrorCode.INTERNAL_ERROR, + await WaitForConnectionErrorAsync(ignoreNonGoAwayFrames: false, expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, CoreStrings.HPackErrorNotEnoughBuffer); } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs index c6c1fe7075..41a451eb76 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -152,6 +152,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests protected readonly RequestDelegate _appAbort; protected TestServiceContext _serviceContext; + private Timer _timer; internal DuplexPipe.DuplexPipePair _pair; protected Http2Connection _connection; @@ -385,6 +386,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests public override void Dispose() { + _timer?.Dispose(); _pair.Application?.Input.Complete(); _pair.Application?.Output.Complete(); _pair.Transport?.Input.Complete(); @@ -457,6 +459,19 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests withStreamId: 0); } + protected void StartHeartbeat() + { + if (_timer == null) + { + _timer = new Timer(OnHeartbeat, state: this, dueTime: Heartbeat.Interval, period: Heartbeat.Interval); + } + } + + private static void OnHeartbeat(object state) + { + ((IRequestProcessor)((Http2TestBase)state)._connection)?.Tick(default); + } + protected Task StartStreamAsync(int streamId, IEnumerable> headers, bool endStream) { var writableBuffer = _pair.Application.Output; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs index 18a8a7b698..5168fcf6f6 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -77,6 +77,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await InitializeConnectionAsync(_noopApplication); + StartHeartbeat(); + AdvanceClock(limits.KeepAliveTimeout + Heartbeat.Interval); // keep-alive timeout set but not fired. @@ -148,7 +150,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 1, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, CoreStrings.BadRequest_RequestHeadersTimeout); @@ -192,7 +194,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests [Theory] [InlineData(Http2FrameType.DATA)] - [InlineData(Http2FrameType.CONTINUATION, Skip = "https://github.com/aspnet/KestrelHttpServer/issues/3077")] + [InlineData(Http2FrameType.CONTINUATION)] public async Task AbortedStream_ResetsAndDrainsRequest_RefusesFramesAfterCooldownExpires(Http2FrameType finalFrameType) { var mockSystemClock = _serviceContext.MockSystemClock; @@ -216,6 +218,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests if (finalFrameType == Http2FrameType.CONTINUATION) { await SendHeadersAsync(1, Http2HeadersFrameFlags.END_STREAM, new byte[0]); + await SendContinuationAsync(1, Http2ContinuationFrameFlags.NONE, new byte[0]); } // There's a race when the appfunc is exiting about how soon it unregisters the stream, so retry until success. @@ -223,7 +226,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { // Just past the timeout mockSystemClock.UtcNow += Constants.RequestBodyDrainTimeout + TimeSpan.FromTicks(1); - (_connection as IRequestProcessor).Tick(mockSystemClock.UtcNow); // Send an extra frame to make it fail switch (finalFrameType) @@ -305,7 +307,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 1, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, null); @@ -363,7 +365,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 1, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, null); @@ -417,7 +419,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 1, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, null); @@ -473,7 +475,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 1, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, null); @@ -541,7 +543,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 3, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, null); @@ -590,7 +592,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 1, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, null); @@ -643,7 +645,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 1, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, null); @@ -712,7 +714,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 3, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, null); @@ -782,7 +784,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 3, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, null); @@ -877,7 +879,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await WaitForConnectionErrorAsync( ignoreNonGoAwayFrames: false, - expectedLastStreamId: 3, + expectedLastStreamId: int.MaxValue, Http2ErrorCode.INTERNAL_ERROR, null); From a4381d9a095d79296fa572fc6507b7cb28b8c5e7 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Thu, 3 Jan 2019 12:29:23 -0800 Subject: [PATCH 65/80] Manual update of Razor SDK bits --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index cf12a4d0a5..39f51b3cfa 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -107,7 +107,7 @@ 3.0.0-preview.18604.3 - 3.0.0-preview.19051.4 + 3.0.0-preview.19053.2 From 3c0433889196b9639909d1c1c9ad23f698b498e9 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 3 Jan 2019 15:58:59 -0800 Subject: [PATCH 66/80] Move PipeAdapters to System.IO.Pipelines namespace. (#6325) --- .../Http/perf/StreamPipeReaderBenchmark.cs | 1 + .../Http/perf/StreamPipeWriterBenchmark.cs | 3 +- src/Http/Http/src/StreamPipeReader.cs | 2 +- src/Http/Http/src/StreamPipeReaderOptions.cs | 5 ++- src/Http/Http/src/StreamPipeWriter.cs | 6 ++-- src/Http/Http/src/ThrowHelper.cs | 2 +- src/Http/Http/test/DefaultHttpContextTests.cs | 3 +- .../Http/test/FlushResultCancellationTests.cs | 2 +- src/Http/Http/test/PipeTest.cs | 2 +- src/Http/Http/test/PipeWriterTests.cs | 2 +- .../Http/test/ReadAsyncCancellationTests.cs | 2 +- src/Http/Http/test/StreamPipeReaderTests.cs | 2 +- src/Http/Http/test/StreamPipeWriterTests.cs | 2 +- src/Http/Http/test/TestMemoryPool.cs | 2 +- src/Http/HttpAbstractions.sln | 34 +++++++++---------- 15 files changed, 38 insertions(+), 32 deletions(-) diff --git a/src/Http/Http/perf/StreamPipeReaderBenchmark.cs b/src/Http/Http/perf/StreamPipeReaderBenchmark.cs index 28940baac0..2b5ef7c24b 100644 --- a/src/Http/Http/perf/StreamPipeReaderBenchmark.cs +++ b/src/Http/Http/perf/StreamPipeReaderBenchmark.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO.Pipelines; using System.Text; using System.Threading; using System.Threading.Tasks; diff --git a/src/Http/Http/perf/StreamPipeWriterBenchmark.cs b/src/Http/Http/perf/StreamPipeWriterBenchmark.cs index b1bb04e8dc..dd7836120d 100644 --- a/src/Http/Http/perf/StreamPipeWriterBenchmark.cs +++ b/src/Http/Http/perf/StreamPipeWriterBenchmark.cs @@ -1,7 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; +using System.IO.Pipelines; using System.Text; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; diff --git a/src/Http/Http/src/StreamPipeReader.cs b/src/Http/Http/src/StreamPipeReader.cs index 241bfb4549..cd62041bed 100644 --- a/src/Http/Http/src/StreamPipeReader.cs +++ b/src/Http/Http/src/StreamPipeReader.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Http +namespace System.IO.Pipelines { /// /// Implements PipeReader using an underlying stream. diff --git a/src/Http/Http/src/StreamPipeReaderOptions.cs b/src/Http/Http/src/StreamPipeReaderOptions.cs index 5c43f1cfb0..3a951db7cc 100644 --- a/src/Http/Http/src/StreamPipeReaderOptions.cs +++ b/src/Http/Http/src/StreamPipeReaderOptions.cs @@ -1,9 +1,12 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System; using System.Buffers; using System.Collections.Generic; using System.Text; -namespace Microsoft.AspNetCore.Http +namespace System.IO.Pipelines { public class StreamPipeReaderOptions { diff --git a/src/Http/Http/src/StreamPipeWriter.cs b/src/Http/Http/src/StreamPipeWriter.cs index 4a75db24f9..f93950feec 100644 --- a/src/Http/Http/src/StreamPipeWriter.cs +++ b/src/Http/Http/src/StreamPipeWriter.cs @@ -12,10 +12,10 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Http +namespace System.IO.Pipelines { /// - /// Implements PipeWriter using a underlying stream. + /// Implements PipeWriter using a underlying stream. /// public class StreamPipeWriter : PipeWriter, IDisposable { @@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Http } /// - /// Creates a new StreamPipeWrapper + /// Creates a new StreamPipeWrapper /// /// The stream to write to public StreamPipeWriter(Stream writingStream) : this(writingStream, 4096) diff --git a/src/Http/Http/src/ThrowHelper.cs b/src/Http/Http/src/ThrowHelper.cs index e16db82913..e671d9f6ee 100644 --- a/src/Http/Http/src/ThrowHelper.cs +++ b/src/Http/Http/src/ThrowHelper.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; -namespace Microsoft.AspNetCore.Http +namespace System.IO.Pipelines { internal static class ThrowHelper { diff --git a/src/Http/Http/test/DefaultHttpContextTests.cs b/src/Http/Http/test/DefaultHttpContextTests.cs index 4aeeabb565..eed9dad007 100644 --- a/src/Http/Http/test/DefaultHttpContextTests.cs +++ b/src/Http/Http/test/DefaultHttpContextTests.cs @@ -9,10 +9,11 @@ using System.Reflection; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Xunit; -namespace Microsoft.AspNetCore.Http +namespace System.IO.Pipelines.Tests { public class DefaultHttpContextTests { diff --git a/src/Http/Http/test/FlushResultCancellationTests.cs b/src/Http/Http/test/FlushResultCancellationTests.cs index 9f02b9a538..e1f2476682 100644 --- a/src/Http/Http/test/FlushResultCancellationTests.cs +++ b/src/Http/Http/test/FlushResultCancellationTests.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNetCore.Http.Tests +namespace System.IO.Pipelines.Tests { public class FlushResultCancellationTests : PipeTest { diff --git a/src/Http/Http/test/PipeTest.cs b/src/Http/Http/test/PipeTest.cs index c94b4a5827..1aa2e5e06a 100644 --- a/src/Http/Http/test/PipeTest.cs +++ b/src/Http/Http/test/PipeTest.cs @@ -5,7 +5,7 @@ using System; using System.IO; using System.IO.Pipelines; -namespace Microsoft.AspNetCore.Http.Tests +namespace System.IO.Pipelines.Tests { public abstract class PipeTest : IDisposable { diff --git a/src/Http/Http/test/PipeWriterTests.cs b/src/Http/Http/test/PipeWriterTests.cs index 564ea88f08..7edffabf2b 100644 --- a/src/Http/Http/test/PipeWriterTests.cs +++ b/src/Http/Http/test/PipeWriterTests.cs @@ -10,7 +10,7 @@ using System.Linq; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNetCore.Http.Tests +namespace System.IO.Pipelines.Tests { public class PipeWriterTests : PipeTest { diff --git a/src/Http/Http/test/ReadAsyncCancellationTests.cs b/src/Http/Http/test/ReadAsyncCancellationTests.cs index 86a599c391..72c80a7058 100644 --- a/src/Http/Http/test/ReadAsyncCancellationTests.cs +++ b/src/Http/Http/test/ReadAsyncCancellationTests.cs @@ -10,7 +10,7 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNetCore.Http.Tests +namespace System.IO.Pipelines.Tests { public class ReadAsyncCancellationTests : PipeTest { diff --git a/src/Http/Http/test/StreamPipeReaderTests.cs b/src/Http/Http/test/StreamPipeReaderTests.cs index 385b8517f6..97e8f3ab63 100644 --- a/src/Http/Http/test/StreamPipeReaderTests.cs +++ b/src/Http/Http/test/StreamPipeReaderTests.cs @@ -12,7 +12,7 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNetCore.Http.Tests +namespace System.IO.Pipelines.Tests { public partial class StreamPipeReaderTests : PipeTest { diff --git a/src/Http/Http/test/StreamPipeWriterTests.cs b/src/Http/Http/test/StreamPipeWriterTests.cs index daa4298a11..e9bee842a1 100644 --- a/src/Http/Http/test/StreamPipeWriterTests.cs +++ b/src/Http/Http/test/StreamPipeWriterTests.cs @@ -10,7 +10,7 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNetCore.Http.Tests +namespace System.IO.Pipelines.Tests { public class StreamPipeWriterTests : PipeTest { diff --git a/src/Http/Http/test/TestMemoryPool.cs b/src/Http/Http/test/TestMemoryPool.cs index 746248a1bc..dfb6b0477a 100644 --- a/src/Http/Http/test/TestMemoryPool.cs +++ b/src/Http/Http/test/TestMemoryPool.cs @@ -9,7 +9,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; -namespace Microsoft.AspNetCore.Http.Tests +namespace System.IO.Pipelines.Tests { public class TestMemoryPool : MemoryPool { diff --git a/src/Http/HttpAbstractions.sln b/src/Http/HttpAbstractions.sln index bbac5e1b46..3a1bc20567 100644 --- a/src/Http/HttpAbstractions.sln +++ b/src/Http/HttpAbstractions.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28407.52 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.136 MinimumVisualStudioVersion = 15.0.26124.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.Abstractions", "Authentication.Abstractions", "{587C3D55-6092-4B86-99F5-E9772C9C1ADB}" EndProject @@ -109,10 +109,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DC519C5E-CA6E-48CA-BF35-B46305B83013}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{DF1EF1B6-9795-4957-979C-F62F58F91743}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides", "..\Middleware\HttpOverrides\src\Microsoft.AspNetCore.HttpOverrides.csproj", "{611794D2-EF3A-422A-A077-23E61C7ADE49}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{1062FCDE-E145-40EC-B175-FDBCAA0C59A0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -579,18 +579,6 @@ Global {1909E2E3-D435-47AA-B2AB-D6EC58BEDC0D}.Release|x64.Build.0 = Release|Any CPU {1909E2E3-D435-47AA-B2AB-D6EC58BEDC0D}.Release|x86.ActiveCfg = Release|Any CPU {1909E2E3-D435-47AA-B2AB-D6EC58BEDC0D}.Release|x86.Build.0 = Release|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Debug|x64.ActiveCfg = Debug|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Debug|x64.Build.0 = Debug|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Debug|x86.ActiveCfg = Debug|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Debug|x86.Build.0 = Debug|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Release|Any CPU.Build.0 = Release|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Release|x64.ActiveCfg = Release|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Release|x64.Build.0 = Release|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Release|x86.ActiveCfg = Release|Any CPU - {DF1EF1B6-9795-4957-979C-F62F58F91743}.Release|x86.Build.0 = Release|Any CPU {611794D2-EF3A-422A-A077-23E61C7ADE49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {611794D2-EF3A-422A-A077-23E61C7ADE49}.Debug|Any CPU.Build.0 = Debug|Any CPU {611794D2-EF3A-422A-A077-23E61C7ADE49}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -603,6 +591,18 @@ Global {611794D2-EF3A-422A-A077-23E61C7ADE49}.Release|x64.Build.0 = Release|Any CPU {611794D2-EF3A-422A-A077-23E61C7ADE49}.Release|x86.ActiveCfg = Release|Any CPU {611794D2-EF3A-422A-A077-23E61C7ADE49}.Release|x86.Build.0 = Release|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Debug|x64.ActiveCfg = Debug|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Debug|x64.Build.0 = Debug|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Debug|x86.ActiveCfg = Debug|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Debug|x86.Build.0 = Debug|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Release|Any CPU.Build.0 = Release|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Release|x64.ActiveCfg = Release|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Release|x64.Build.0 = Release|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Release|x86.ActiveCfg = Release|Any CPU + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -649,8 +649,8 @@ Global {EEA036BB-E6B8-4D01-907B-D4B34B4368DB} = {793FFE24-138A-4C3D-81AB-18D625E36230} {1909E2E3-D435-47AA-B2AB-D6EC58BEDC0D} = {793FFE24-138A-4C3D-81AB-18D625E36230} {DC519C5E-CA6E-48CA-BF35-B46305B83013} = {14A7B3DE-46C8-4245-B0BD-9AFF3795C163} - {DF1EF1B6-9795-4957-979C-F62F58F91743} = {793FFE24-138A-4C3D-81AB-18D625E36230} {611794D2-EF3A-422A-A077-23E61C7ADE49} = {793FFE24-138A-4C3D-81AB-18D625E36230} + {1062FCDE-E145-40EC-B175-FDBCAA0C59A0} = {793FFE24-138A-4C3D-81AB-18D625E36230} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {85B5E151-2E9D-419C-83DD-0DDCF446C83A} From 236ceb73c1c4f26c19e34a4d570b2814c9b52da0 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Thu, 3 Jan 2019 14:36:38 -0800 Subject: [PATCH 67/80] Remove Mvc.NoFun.sln --- src/Mvc/Mvc.NoFun.sln | 1232 ----------------------------------------- 1 file changed, 1232 deletions(-) delete mode 100644 src/Mvc/Mvc.NoFun.sln diff --git a/src/Mvc/Mvc.NoFun.sln b/src/Mvc/Mvc.NoFun.sln deleted file mode 100644 index 2a17a7db85..0000000000 --- a/src/Mvc/Mvc.NoFun.sln +++ /dev/null @@ -1,1232 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28315.86 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{32285FA4-6B46-4D6B-A840-2B13E4C8B58E}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - test\MvcTests.ruleset = test\MvcTests.ruleset - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{079EFA1F-0B0A-4853-B27B-5780D111CD85}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj", "{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Test", "test\Microsoft.AspNetCore.Mvc.Razor.Test\Microsoft.AspNetCore.Mvc.Razor.Test.csproj", "{3F6E355E-4869-41D9-943B-D54771221A7F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.Test", "test\Microsoft.AspNetCore.Mvc.Core.Test\Microsoft.AspNetCore.Mvc.Core.Test.csproj", "{A8AA326E-8EE8-4F11-B750-23028E0949D7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Test", "test\Microsoft.AspNetCore.Mvc.Test\Microsoft.AspNetCore.Mvc.Test.csproj", "{5F945B82-FE5F-425C-956C-8BC2F2020254}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{B2347320-308E-4D2B-AEC8-005DFA68B0C9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers.Test", "test\Microsoft.AspNetCore.Mvc.TagHelpers.Test\Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj", "{860119ED-3DB1-424D-8D0A-30132A8A7D96}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.TestCommon", "test\Microsoft.AspNetCore.Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj", "{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.IntegrationTests", "test\Microsoft.AspNetCore.Mvc.IntegrationTests\Microsoft.AspNetCore.Mvc.IntegrationTests.csproj", "{864FA09D-1E48-403A-A6C8-4F079D2A30F0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{1154203C-7579-4525-906E-BC55268421C1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{A2B72833-5D70-4C42-AE85-E0319926FB8A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer.Test", "test\Microsoft.AspNetCore.Mvc.ApiExplorer.Test\Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj", "{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions.Test", "test\Microsoft.AspNetCore.Mvc.Abstractions.Test\Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj", "{DA000953-7532-4DF5-8DB9-8143DF98D999}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json", "src\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj", "{3FC8D9D6-9352-43A3-8E81-422F270085B7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml", "src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj", "{42C81540-CD47-4C68-A7A3-2A93B9C3B210}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json.Test", "test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj", "{493780DA-E696-40FF-BD12-4A5C5736F292}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml.Test", "test\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj", "{22019146-BDFA-442E-8C8E-345FB9644578}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj", "{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{2DD786CA-7AF7-437A-B499-801A589B9A1C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors.Test", "test\Microsoft.AspNetCore.Mvc.Cors.Test\Microsoft.AspNetCore.Mvc.Cors.Test.csproj", "{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations.Test", "test\Microsoft.AspNetCore.Mvc.DataAnnotations.Test\Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj", "{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures.Test", "test\Microsoft.AspNetCore.Mvc.ViewFeatures.Test\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj", "{60873DFA-97B9-419E-BAA3-940FC9B07085}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj", "{50893B10-5735-4F35-9995-F81DA3F0189E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization.Test", "test\Microsoft.AspNetCore.Mvc.Localization.Test\Microsoft.AspNetCore.Mvc.Localization.Test.csproj", "{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TestDiagnosticListener", "test\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj", "{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcSandbox", "samples\MvcSandbox\MvcSandbox.csproj", "{14ED4476-9F24-4776-8417-EA6927F6C9C9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages.Test", "test\Microsoft.AspNetCore.Mvc.RazorPages.Test\Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj", "{0AB46520-F441-4E01-B444-08F4D23F8B1B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance", "benchmarks\Microsoft.AspNetCore.Mvc.Performance\Microsoft.AspNetCore.Mvc.Performance.csproj", "{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E1795C3-60C5-4AD2-A15F-93F6CE8FAD36}" - ProjectSection(SolutionItems) = preProject - .appveyor.yml = .appveyor.yml - .editorconfig = .editorconfig - .gitattributes = .gitattributes - .gitignore = .gitignore - .travis.yml = .travis.yml - build.cmd = build.cmd - build.ps1 = build.ps1 - build.sh = build.sh - CONTRIBUTING.md = CONTRIBUTING.md - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - LICENSE.txt = LICENSE.txt - NuGet.config = NuGet.config - NuGetPackageVerifier.json = NuGetPackageVerifier.json - README.md = README.md - Settings.StyleCop = Settings.StyleCop - version.xml = version.xml - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{44546170-35BF-448F-88F5-4331AE67AEAE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Analyzers.Test", "test\Mvc.Analyzers.Test\Mvc.Analyzers.Test.csproj", "{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Views.TestCommon", "test\Microsoft.AspNetCore.Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj", "{0772E545-A674-4165-9469-E3D79D88A4A8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{92D959F2-66B8-490A-BA33-DA4421EBC948}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Api.Analyzers", "src\Microsoft.AspNetCore.Mvc.Api.Analyzers\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj", "{1B398182-9EAE-400B-A2BD-EFFAC0168A36}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Api.Analyzers.Test", "test\Mvc.Api.Analyzers.Test\Mvc.Api.Analyzers.Test.csproj", "{71C626FC-6408-494B-A127-38CB64F71324}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-getdocument", "src\dotnet-getdocument\dotnet-getdocument.csproj", "{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetDocumentInsider", "src\GetDocumentInsider\GetDocumentInsider.csproj", "{2F683CF8-B055-46AE-BF83-9D1307F8D45F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Design", "src\Microsoft.Extensions.ApiDescription.Design\Microsoft.Extensions.ApiDescription.Design.csproj", "{34E3C302-B767-40C8-B538-3EE2BD4000C4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance.Views", "benchmarks\Microsoft.AspNetCore.Mvc.Performance.Views\Microsoft.AspNetCore.Mvc.Performance.Views.csproj", "{9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "..\Antiforgery\src\Microsoft.AspNetCore.Antiforgery.csproj", "{ABF364DD-5415-4234-9C1C-BAE30EE243B2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Abstractions", "..\Http\Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "{46C69B2A-74C3-450B-B19E-EAE15298A6D7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Core", "..\Http\Authentication.Core\src\Microsoft.AspNetCore.Authentication.Core.csproj", "{3BA943A3-EF92-4D2C-A148-2BB18444D548}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "..\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj", "{4AA9A6DF-8A9D-41E2-916A-D970C63E357A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "..\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "..\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj", "{C8855927-37B3-44C7-8EAE-B05615EFEF84}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.Internal", "..\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj", "{46335D95-121F-4B85-8B86-D4BB043CC2CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "..\DataProtection\DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{A60D1892-4080-410D-B069-D023D244A9AC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "..\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{1226FA9A-428C-4911-AC01-15C1AD44A35C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "..\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj", "{875EFC54-B4DE-4814-B272-37BBC1D8E532}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "..\Hosting\Server.Abstractions\src\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", "{20934FC5-8C76-4A0B-AC94-D23BBFD1601D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions", "..\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj", "{612E332E-2522-46E7-816F-4B95B7BEB75E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{7063C0F0-C924-4304-BF24-1182542B0D8E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions", "..\Http\Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj", "{D38FE75C-0419-411B-96EB-80334F07103B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions", "..\Http\Http.Extensions\src\Microsoft.AspNetCore.Http.Extensions.csproj", "{22D261EF-670E-44D2-A2C5-4E79414EB10B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features", "..\Http\Http.Features\src\Microsoft.AspNetCore.Http.Features.csproj", "{A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides", "..\Middleware\HttpOverrides\src\Microsoft.AspNetCore.HttpOverrides.csproj", "{657ED986-9E52-423B-A389-F2FD123B4CC1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPatch", "..\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj", "{B2242E8F-0A7B-4358-BC29-56745C89E0DE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization", "..\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj", "{C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "..\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj", "{36BBC92A-539F-4A5C-9215-D72A2B8F73C7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "..\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "..\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj", "{6EF4D17E-D0E4-42E6-895A-67F2F55B4678}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "..\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{2D42D033-14A6-4374-880F-F7CBDEEFE6D2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "..\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{B627BF08-39D1-4B38-B546-BFB98E0F5916}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{4B42670E-9AD5-4D4D-BF70-295BC2B474D4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{138F8243-B512-4FA9-9E3C-ABF5297C7092}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{FE319B31-4267-43D0-A3E2-3857E4F1EDB1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{512F4020-4841-4CDA-BFDA-1AF63B7678BB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{6B19EA89-C2B7-4625-8931-C7B459A54C16}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "..\Http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{C87F83AE-2B23-477C-A577-0DB77191F254}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|x86.ActiveCfg = Debug|Any CPU - {079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Any CPU.Build.0 = Release|Any CPU - {079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|x86.ActiveCfg = Release|Any CPU - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|x86.ActiveCfg = Debug|Any CPU - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Any CPU.Build.0 = Release|Any CPU - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|x86.ActiveCfg = Release|Any CPU - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|x86.ActiveCfg = Debug|Any CPU - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Any CPU.Build.0 = Release|Any CPU - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|x86.ActiveCfg = Release|Any CPU - {3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|x86.ActiveCfg = Debug|Any CPU - {3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Any CPU.Build.0 = Release|Any CPU - {3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3F6E355E-4869-41D9-943B-D54771221A7F}.Release|x86.ActiveCfg = Release|Any CPU - {A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|x86.ActiveCfg = Debug|Any CPU - {A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Any CPU.Build.0 = Release|Any CPU - {A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|x86.ActiveCfg = Release|Any CPU - {5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|x86.ActiveCfg = Debug|Any CPU - {5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Any CPU.Build.0 = Release|Any CPU - {5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|x86.ActiveCfg = Release|Any CPU - {B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|x86.ActiveCfg = Debug|Any CPU - {B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Any CPU.Build.0 = Release|Any CPU - {B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|x86.ActiveCfg = Release|Any CPU - {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|x86.ActiveCfg = Debug|Any CPU - {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Any CPU.Build.0 = Release|Any CPU - {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|x86.ActiveCfg = Release|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|x86.ActiveCfg = Debug|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|x86.Build.0 = Debug|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Any CPU.Build.0 = Release|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|x86.ActiveCfg = Release|Any CPU - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|x86.Build.0 = Release|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|x86.ActiveCfg = Debug|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|x86.Build.0 = Debug|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Any CPU.Build.0 = Release|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|x86.ActiveCfg = Release|Any CPU - {864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|x86.Build.0 = Release|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Debug|x86.ActiveCfg = Debug|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Debug|x86.Build.0 = Debug|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Release|Any CPU.Build.0 = Release|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Release|x86.ActiveCfg = Release|Any CPU - {1154203C-7579-4525-906E-BC55268421C1}.Release|x86.Build.0 = Release|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.ActiveCfg = Debug|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.Build.0 = Debug|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.Build.0 = Release|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.ActiveCfg = Release|Any CPU - {A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.Build.0 = Release|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.ActiveCfg = Debug|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.Build.0 = Debug|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.Build.0 = Release|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.ActiveCfg = Release|Any CPU - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.Build.0 = Release|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|x86.ActiveCfg = Debug|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|x86.Build.0 = Debug|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Any CPU.Build.0 = Release|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.ActiveCfg = Release|Any CPU - {DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.Build.0 = Release|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.ActiveCfg = Debug|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.Build.0 = Debug|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.Build.0 = Release|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.ActiveCfg = Release|Any CPU - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.Build.0 = Release|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.ActiveCfg = Debug|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.Build.0 = Debug|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.Build.0 = Release|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.ActiveCfg = Release|Any CPU - {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.Build.0 = Release|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.ActiveCfg = Debug|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.Build.0 = Debug|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.Build.0 = Release|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.ActiveCfg = Release|Any CPU - {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.Build.0 = Release|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.Build.0 = Debug|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.ActiveCfg = Debug|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.Build.0 = Debug|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.ActiveCfg = Release|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.Build.0 = Release|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.ActiveCfg = Release|Any CPU - {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.Build.0 = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.ActiveCfg = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.Build.0 = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.Build.0 = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.ActiveCfg = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.Build.0 = Release|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.ActiveCfg = Debug|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.Build.0 = Debug|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.Build.0 = Release|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.ActiveCfg = Release|Any CPU - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.Build.0 = Release|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.ActiveCfg = Debug|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.Build.0 = Debug|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.Build.0 = Release|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.ActiveCfg = Release|Any CPU - {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.Build.0 = Release|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.ActiveCfg = Debug|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.Build.0 = Debug|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.Build.0 = Release|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.ActiveCfg = Release|Any CPU - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.Build.0 = Release|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.ActiveCfg = Debug|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.Build.0 = Debug|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.Build.0 = Release|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.ActiveCfg = Release|Any CPU - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.Build.0 = Release|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.ActiveCfg = Debug|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.Build.0 = Debug|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.Build.0 = Release|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.ActiveCfg = Release|Any CPU - {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.Build.0 = Release|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|x86.ActiveCfg = Debug|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|x86.Build.0 = Debug|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Any CPU.Build.0 = Release|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Release|x86.ActiveCfg = Release|Any CPU - {50893B10-5735-4F35-9995-F81DA3F0189E}.Release|x86.Build.0 = Release|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|x86.ActiveCfg = Debug|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|x86.Build.0 = Debug|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Any CPU.Build.0 = Release|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|x86.ActiveCfg = Release|Any CPU - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|x86.Build.0 = Release|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|x86.ActiveCfg = Debug|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|x86.Build.0 = Debug|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Any CPU.Build.0 = Release|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|x86.ActiveCfg = Release|Any CPU - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|x86.Build.0 = Release|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|x86.ActiveCfg = Debug|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|x86.Build.0 = Debug|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Any CPU.Build.0 = Release|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|x86.ActiveCfg = Release|Any CPU - {14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|x86.Build.0 = Release|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|x86.ActiveCfg = Debug|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|x86.Build.0 = Debug|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Any CPU.Build.0 = Release|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|x86.ActiveCfg = Release|Any CPU - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|x86.Build.0 = Release|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|x86.ActiveCfg = Debug|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|x86.Build.0 = Debug|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Any CPU.Build.0 = Release|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|x86.ActiveCfg = Release|Any CPU - {0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|x86.Build.0 = Release|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|x86.ActiveCfg = Debug|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|x86.Build.0 = Debug|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Any CPU.Build.0 = Release|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|x86.ActiveCfg = Release|Any CPU - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|x86.Build.0 = Release|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|x86.ActiveCfg = Debug|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|x86.Build.0 = Debug|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Any CPU.Build.0 = Release|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|x86.ActiveCfg = Release|Any CPU - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|x86.Build.0 = Release|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|x86.ActiveCfg = Debug|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|x86.Build.0 = Debug|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Any CPU.Build.0 = Release|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|x86.ActiveCfg = Release|Any CPU - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|x86.Build.0 = Release|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Debug|x86.ActiveCfg = Debug|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Debug|x86.Build.0 = Debug|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Release|Any CPU.Build.0 = Release|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Release|x86.ActiveCfg = Release|Any CPU - {0772E545-A674-4165-9469-E3D79D88A4A8}.Release|x86.Build.0 = Release|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Debug|x86.ActiveCfg = Debug|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Debug|x86.Build.0 = Debug|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Release|Any CPU.Build.0 = Release|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Release|x86.ActiveCfg = Release|Any CPU - {92D959F2-66B8-490A-BA33-DA4421EBC948}.Release|x86.Build.0 = Release|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Debug|x86.ActiveCfg = Debug|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Debug|x86.Build.0 = Debug|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Release|Any CPU.Build.0 = Release|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Release|x86.ActiveCfg = Release|Any CPU - {1B398182-9EAE-400B-A2BD-EFFAC0168A36}.Release|x86.Build.0 = Release|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Debug|x86.ActiveCfg = Debug|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Debug|x86.Build.0 = Debug|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Release|Any CPU.Build.0 = Release|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Release|x86.ActiveCfg = Release|Any CPU - {71C626FC-6408-494B-A127-38CB64F71324}.Release|x86.Build.0 = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|x86.ActiveCfg = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|x86.Build.0 = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Any CPU.Build.0 = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|x86.ActiveCfg = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|x86.Build.0 = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|x86.ActiveCfg = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|x86.Build.0 = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Any CPU.Build.0 = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|x86.ActiveCfg = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|x86.Build.0 = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|x86.ActiveCfg = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|x86.Build.0 = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Any CPU.Build.0 = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|x86.ActiveCfg = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|x86.Build.0 = Release|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Debug|x86.ActiveCfg = Debug|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Debug|x86.Build.0 = Debug|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Release|Any CPU.Build.0 = Release|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Release|x86.ActiveCfg = Release|Any CPU - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74}.Release|x86.Build.0 = Release|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|x86.ActiveCfg = Debug|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Debug|x86.Build.0 = Debug|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|Any CPU.Build.0 = Release|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|x86.ActiveCfg = Release|Any CPU - {C87F83AE-2B23-477C-A577-0DB77191F254}.Release|x86.Build.0 = Release|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|x86.ActiveCfg = Debug|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Debug|x86.Build.0 = Debug|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|Any CPU.Build.0 = Release|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|x86.ActiveCfg = Release|Any CPU - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F}.Release|x86.Build.0 = Release|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|x86.ActiveCfg = Debug|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Debug|x86.Build.0 = Debug|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|Any CPU.Build.0 = Release|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|x86.ActiveCfg = Release|Any CPU - {22D261EF-670E-44D2-A2C5-4E79414EB10B}.Release|x86.Build.0 = Release|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|x86.ActiveCfg = Debug|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Debug|x86.Build.0 = Debug|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|Any CPU.Build.0 = Release|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|x86.ActiveCfg = Release|Any CPU - {3BA943A3-EF92-4D2C-A148-2BB18444D548}.Release|x86.Build.0 = Release|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|x86.ActiveCfg = Debug|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Debug|x86.Build.0 = Debug|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|Any CPU.Build.0 = Release|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|x86.ActiveCfg = Release|Any CPU - {7063C0F0-C924-4304-BF24-1182542B0D8E}.Release|x86.Build.0 = Release|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|x86.ActiveCfg = Debug|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Debug|x86.Build.0 = Debug|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|Any CPU.Build.0 = Release|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|x86.ActiveCfg = Release|Any CPU - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D}.Release|x86.Build.0 = Release|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|x86.ActiveCfg = Debug|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Debug|x86.Build.0 = Debug|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|Any CPU.Build.0 = Release|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|x86.ActiveCfg = Release|Any CPU - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2}.Release|x86.Build.0 = Release|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|x86.ActiveCfg = Debug|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Debug|x86.Build.0 = Debug|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|Any CPU.Build.0 = Release|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|x86.ActiveCfg = Release|Any CPU - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2}.Release|x86.Build.0 = Release|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|x86.ActiveCfg = Debug|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Debug|x86.Build.0 = Debug|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|Any CPU.Build.0 = Release|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|x86.ActiveCfg = Release|Any CPU - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A}.Release|x86.Build.0 = Release|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|x86.ActiveCfg = Debug|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Debug|x86.Build.0 = Debug|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|Any CPU.Build.0 = Release|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|x86.ActiveCfg = Release|Any CPU - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D}.Release|x86.Build.0 = Release|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|x86.ActiveCfg = Debug|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Debug|x86.Build.0 = Debug|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Release|Any CPU.Build.0 = Release|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Release|x86.ActiveCfg = Release|Any CPU - {D38FE75C-0419-411B-96EB-80334F07103B}.Release|x86.Build.0 = Release|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|x86.ActiveCfg = Debug|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Debug|x86.Build.0 = Debug|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|Any CPU.Build.0 = Release|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|x86.ActiveCfg = Release|Any CPU - {ABF364DD-5415-4234-9C1C-BAE30EE243B2}.Release|x86.Build.0 = Release|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|x86.ActiveCfg = Debug|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Debug|x86.Build.0 = Debug|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|Any CPU.Build.0 = Release|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|x86.ActiveCfg = Release|Any CPU - {B2242E8F-0A7B-4358-BC29-56745C89E0DE}.Release|x86.Build.0 = Release|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|x86.ActiveCfg = Debug|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Debug|x86.Build.0 = Debug|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|Any CPU.Build.0 = Release|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|x86.ActiveCfg = Release|Any CPU - {6B19EA89-C2B7-4625-8931-C7B459A54C16}.Release|x86.Build.0 = Release|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|x86.ActiveCfg = Debug|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Debug|x86.Build.0 = Debug|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|Any CPU.Build.0 = Release|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|x86.ActiveCfg = Release|Any CPU - {612E332E-2522-46E7-816F-4B95B7BEB75E}.Release|x86.Build.0 = Release|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|x86.ActiveCfg = Debug|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Debug|x86.Build.0 = Debug|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|Any CPU.Build.0 = Release|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|x86.ActiveCfg = Release|Any CPU - {46C69B2A-74C3-450B-B19E-EAE15298A6D7}.Release|x86.Build.0 = Release|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|x86.ActiveCfg = Debug|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Debug|x86.Build.0 = Debug|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|Any CPU.Build.0 = Release|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|x86.ActiveCfg = Release|Any CPU - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84}.Release|x86.Build.0 = Release|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|x86.ActiveCfg = Debug|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Debug|x86.Build.0 = Debug|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|Any CPU.Build.0 = Release|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|x86.ActiveCfg = Release|Any CPU - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C}.Release|x86.Build.0 = Release|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|x86.ActiveCfg = Debug|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Debug|x86.Build.0 = Debug|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|Any CPU.Build.0 = Release|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|x86.ActiveCfg = Release|Any CPU - {C8855927-37B3-44C7-8EAE-B05615EFEF84}.Release|x86.Build.0 = Release|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|Any CPU.Build.0 = Debug|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|x86.ActiveCfg = Debug|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Debug|x86.Build.0 = Debug|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|Any CPU.ActiveCfg = Release|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|Any CPU.Build.0 = Release|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|x86.ActiveCfg = Release|Any CPU - {875EFC54-B4DE-4814-B272-37BBC1D8E532}.Release|x86.Build.0 = Release|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|x86.ActiveCfg = Debug|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Debug|x86.Build.0 = Debug|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|Any CPU.Build.0 = Release|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|x86.ActiveCfg = Release|Any CPU - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4}.Release|x86.Build.0 = Release|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|x86.ActiveCfg = Debug|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Debug|x86.Build.0 = Debug|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|Any CPU.Build.0 = Release|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|x86.ActiveCfg = Release|Any CPU - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB}.Release|x86.Build.0 = Release|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|x86.ActiveCfg = Debug|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Debug|x86.Build.0 = Debug|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|Any CPU.Build.0 = Release|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|x86.ActiveCfg = Release|Any CPU - {512F4020-4841-4CDA-BFDA-1AF63B7678BB}.Release|x86.Build.0 = Release|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|x86.ActiveCfg = Debug|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Debug|x86.Build.0 = Debug|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|Any CPU.Build.0 = Release|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|x86.ActiveCfg = Release|Any CPU - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8}.Release|x86.Build.0 = Release|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|x86.ActiveCfg = Debug|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Debug|x86.Build.0 = Debug|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|Any CPU.Build.0 = Release|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|x86.ActiveCfg = Release|Any CPU - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678}.Release|x86.Build.0 = Release|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|x86.ActiveCfg = Debug|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Debug|x86.Build.0 = Debug|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|Any CPU.Build.0 = Release|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|x86.ActiveCfg = Release|Any CPU - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3}.Release|x86.Build.0 = Release|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|x86.ActiveCfg = Debug|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Debug|x86.Build.0 = Debug|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|Any CPU.Build.0 = Release|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|x86.ActiveCfg = Release|Any CPU - {B627BF08-39D1-4B38-B546-BFB98E0F5916}.Release|x86.Build.0 = Release|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|x86.ActiveCfg = Debug|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Debug|x86.Build.0 = Debug|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|Any CPU.Build.0 = Release|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|x86.ActiveCfg = Release|Any CPU - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4}.Release|x86.Build.0 = Release|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|x86.ActiveCfg = Debug|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Debug|x86.Build.0 = Debug|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Release|Any CPU.Build.0 = Release|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Release|x86.ActiveCfg = Release|Any CPU - {A60D1892-4080-410D-B069-D023D244A9AC}.Release|x86.Build.0 = Release|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|x86.ActiveCfg = Debug|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Debug|x86.Build.0 = Debug|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|Any CPU.Build.0 = Release|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|x86.ActiveCfg = Release|Any CPU - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6}.Release|x86.Build.0 = Release|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|x86.ActiveCfg = Debug|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Debug|x86.Build.0 = Debug|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|Any CPU.Build.0 = Release|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|x86.ActiveCfg = Release|Any CPU - {657ED986-9E52-423B-A389-F2FD123B4CC1}.Release|x86.Build.0 = Release|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|x86.ActiveCfg = Debug|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Debug|x86.Build.0 = Debug|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|Any CPU.Build.0 = Release|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|x86.ActiveCfg = Release|Any CPU - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7}.Release|x86.Build.0 = Release|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|Any CPU.Build.0 = Debug|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|x86.ActiveCfg = Debug|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Debug|x86.Build.0 = Debug|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|Any CPU.ActiveCfg = Release|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|Any CPU.Build.0 = Release|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|x86.ActiveCfg = Release|Any CPU - {138F8243-B512-4FA9-9E3C-ABF5297C7092}.Release|x86.Build.0 = Release|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|x86.ActiveCfg = Debug|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Debug|x86.Build.0 = Debug|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|Any CPU.Build.0 = Release|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|x86.ActiveCfg = Release|Any CPU - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1}.Release|x86.Build.0 = Release|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|x86.ActiveCfg = Debug|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Debug|x86.Build.0 = Debug|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|Any CPU.Build.0 = Release|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|x86.ActiveCfg = Release|Any CPU - {1226FA9A-428C-4911-AC01-15C1AD44A35C}.Release|x86.Build.0 = Release|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|x86.ActiveCfg = Debug|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Debug|x86.Build.0 = Debug|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|Any CPU.Build.0 = Release|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|x86.ActiveCfg = Release|Any CPU - {46335D95-121F-4B85-8B86-D4BB043CC2CA}.Release|x86.Build.0 = Release|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|x86.ActiveCfg = Debug|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Debug|x86.Build.0 = Debug|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|Any CPU.Build.0 = Release|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|x86.ActiveCfg = Release|Any CPU - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C}.Release|x86.Build.0 = Release|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|x86.ActiveCfg = Debug|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Debug|x86.Build.0 = Debug|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|Any CPU.Build.0 = Release|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|x86.ActiveCfg = Release|Any CPU - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {079EFA1F-0B0A-4853-B27B-5780D111CD85} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {314E9AD6-2FFC-4A92-A8AD-510658C64F1E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {C48DA9D7-ACB5-4408-AA79-27ECB60A67EF} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {3F6E355E-4869-41D9-943B-D54771221A7F} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {A8AA326E-8EE8-4F11-B750-23028E0949D7} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {5F945B82-FE5F-425C-956C-8BC2F2020254} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {B2347320-308E-4D2B-AEC8-005DFA68B0C9} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {860119ED-3DB1-424D-8D0A-30132A8A7D96} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {864FA09D-1E48-403A-A6C8-4F079D2A30F0} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {1154203C-7579-4525-906E-BC55268421C1} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {A2B72833-5D70-4C42-AE85-E0319926FB8A} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {DA000953-7532-4DF5-8DB9-8143DF98D999} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {3F8B8FC1-9FE4-4788-8991-367113E8D7AD} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {3FC8D9D6-9352-43A3-8E81-422F270085B7} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {42C81540-CD47-4C68-A7A3-2A93B9C3B210} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {493780DA-E696-40FF-BD12-4A5C5736F292} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {22019146-BDFA-442E-8C8E-345FB9644578} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {9A07EEA2-942E-4969-9D41-799B6E2D1FF5} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {2DD786CA-7AF7-437A-B499-801A589B9A1C} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {60873DFA-97B9-419E-BAA3-940FC9B07085} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {50893B10-5735-4F35-9995-F81DA3F0189E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {8FC726B5-E766-44E0-8B38-1313B6D8D9A7} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {14ED4476-9F24-4776-8417-EA6927F6C9C9} = {DAAE4C74-D06F-4874-A166-33305D2643CE} - {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {0AB46520-F441-4E01-B444-08F4D23F8B1B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35} = {44546170-35BF-448F-88F5-4331AE67AEAE} - {30862895-C1FA-49F5-B69A-B0F9F2ECD0F3} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {829D9A67-2D07-4CE6-86C0-59F2549B0CFA} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {0772E545-A674-4165-9469-E3D79D88A4A8} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {92D959F2-66B8-490A-BA33-DA4421EBC948} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {1B398182-9EAE-400B-A2BD-EFFAC0168A36} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {71C626FC-6408-494B-A127-38CB64F71324} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {2F683CF8-B055-46AE-BF83-9D1307F8D45F} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {34E3C302-B767-40C8-B538-3EE2BD4000C4} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {9E00C4CA-9CCE-43C8-9D29-CAA0A8D8AC74} = {44546170-35BF-448F-88F5-4331AE67AEAE} - {C87F83AE-2B23-477C-A577-0DB77191F254} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {D794C2D1-47CD-4C46-8272-62DF0FF8DC4F} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {22D261EF-670E-44D2-A2C5-4E79414EB10B} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {3BA943A3-EF92-4D2C-A148-2BB18444D548} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {7063C0F0-C924-4304-BF24-1182542B0D8E} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {EE8BF3E0-7898-41B7-9C26-21AA2DF4018D} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {AEFC291E-9FAB-4C8C-BE29-4CB8F2D04EE2} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {2D42D033-14A6-4374-880F-F7CBDEEFE6D2} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {4AA9A6DF-8A9D-41E2-916A-D970C63E357A} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {20934FC5-8C76-4A0B-AC94-D23BBFD1601D} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {D38FE75C-0419-411B-96EB-80334F07103B} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {ABF364DD-5415-4234-9C1C-BAE30EE243B2} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {B2242E8F-0A7B-4358-BC29-56745C89E0DE} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {6B19EA89-C2B7-4625-8931-C7B459A54C16} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {612E332E-2522-46E7-816F-4B95B7BEB75E} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {46C69B2A-74C3-450B-B19E-EAE15298A6D7} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {A2D75DA1-833A-4A60-9FD3-41E8EC8A3F84} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {383E2848-7F99-4BAF-AA0D-FA5C5DC5D36C} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {C8855927-37B3-44C7-8EAE-B05615EFEF84} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {875EFC54-B4DE-4814-B272-37BBC1D8E532} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {F19EBFB6-6E37-4050-B228-6CDF6C2ECAB4} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {C9FBFD93-BF2C-4BAB-B143-FC4F4C8332AB} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {512F4020-4841-4CDA-BFDA-1AF63B7678BB} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {C051E05C-77FD-4CDE-8E1F-2A51A872BFC8} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {6EF4D17E-D0E4-42E6-895A-67F2F55B4678} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {8073C2B6-32E3-4D4E-8BAE-7E7CBF7DE9C3} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {B627BF08-39D1-4B38-B546-BFB98E0F5916} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {4B42670E-9AD5-4D4D-BF70-295BC2B474D4} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {A60D1892-4080-410D-B069-D023D244A9AC} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {7ECD6FBB-509E-41EA-8E1D-72AF53F774F6} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {657ED986-9E52-423B-A389-F2FD123B4CC1} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {36BBC92A-539F-4A5C-9215-D72A2B8F73C7} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {138F8243-B512-4FA9-9E3C-ABF5297C7092} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {FE319B31-4267-43D0-A3E2-3857E4F1EDB1} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {1226FA9A-428C-4911-AC01-15C1AD44A35C} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {46335D95-121F-4B85-8B86-D4BB043CC2CA} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {FC5C9C4D-E3C4-438A-9F2A-E2DC92384E7C} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - {7DFCACDC-E9BE-47BA-B86D-B13887BE9A78} = {EA60D8DE-3F18-4A70-A098-F35D4A8D7BF4} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D003597F-372F-4068-A2F0-353BE3C3B39A} - EndGlobalSection -EndGlobal From 6a5c0cf1893cf16bf9eb375df664684f1514ddf5 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Thu, 3 Jan 2019 16:31:53 -0800 Subject: [PATCH 68/80] Manually time out H2SpecTests (#6366) --- .../Interop.FunctionalTests/H2SpecCommands.cs | 16 +++++++++++++--- .../test/Interop.FunctionalTests/H2SpecTests.cs | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecCommands.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecCommands.cs index 0286f571f7..b3f4548865 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecCommands.cs +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecCommands.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.Globalization; using System.IO; using System.Runtime.InteropServices; +using System.Threading.Tasks; using System.Xml; using Microsoft.Extensions.Logging; @@ -14,6 +15,8 @@ namespace Interop.FunctionalTests { public static class H2SpecCommands { + private const int TimeoutSeconds = 15; + private static string GetToolLocation() { var root = Path.Combine(Environment.CurrentDirectory, "h2spec"); @@ -166,14 +169,14 @@ namespace Interop.FunctionalTests return false; } - public static void RunTest(string testId, int port, bool https, ILogger logger) + public static async Task RunTest(string testId, int port, bool https, ILogger logger) { var tempFile = Path.GetTempPath() + Guid.NewGuid() + ".xml"; var processOptions = new ProcessStartInfo { FileName = GetToolLocation(), RedirectStandardOutput = true, - Arguments = $"{testId} -p {port.ToString(CultureInfo.InvariantCulture)} --strict -j {tempFile} --timeout 15" + Arguments = $"{testId} -p {port.ToString(CultureInfo.InvariantCulture)} --strict -j {tempFile} --timeout {TimeoutSeconds}" + (https ? " --tls --insecure" : ""), WindowStyle = ProcessWindowStyle.Hidden, CreateNoWindow = true, @@ -181,7 +184,14 @@ namespace Interop.FunctionalTests using (var process = Process.Start(processOptions)) { - var data = process.StandardOutput.ReadToEnd(); + var dataTask = process.StandardOutput.ReadToEndAsync(); + + if (await Task.WhenAny(dataTask, Task.Delay(TimeSpan.FromSeconds(TimeoutSeconds * 2))) != dataTask) + { + throw new TimeoutException($"h2spec didn't exit within {TimeoutSeconds * 2} seconds."); + } + + var data = await dataTask; logger.LogDebug(data); var results = File.ReadAllText(tempFile); diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs index f0c3b3de00..361b4c0e50 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs @@ -46,7 +46,7 @@ namespace Interop.FunctionalTests { await host.StartAsync(); - H2SpecCommands.RunTest(testCase.Id, host.GetPort(), testCase.Https, Logger); + await H2SpecCommands.RunTest(testCase.Id, host.GetPort(), testCase.Https, Logger); await host.StopAsync(); } From 51047ef9d6d68b915f346e6e823115b04d1b5ee1 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Fri, 4 Jan 2019 15:28:59 +1300 Subject: [PATCH 69/80] Update solutions to use correct IIS project location (#6344) --- src/Middleware/Middleware.sln | 28 ++++++++++++++-------------- src/Security/Security.sln | 18 +++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln index a9d0db422d..7b193f6521 100644 --- a/src/Middleware/Middleware.sln +++ b/src/Middleware/Middleware.sln @@ -251,7 +251,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleDestination", "CORS\s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleOrigin", "CORS\samples\SampleOrigin\SampleOrigin.csproj", "{198FFE3B-0346-4856-A6C9-8752D51C4EB3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{F6206539-038C-410A-86F7-3919D49A28C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{47B6636D-09A3-47AE-9303-9F5D15EEE9D8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -1379,18 +1379,18 @@ Global {198FFE3B-0346-4856-A6C9-8752D51C4EB3}.Release|x64.Build.0 = Release|Any CPU {198FFE3B-0346-4856-A6C9-8752D51C4EB3}.Release|x86.ActiveCfg = Release|Any CPU {198FFE3B-0346-4856-A6C9-8752D51C4EB3}.Release|x86.Build.0 = Release|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Debug|x64.ActiveCfg = Debug|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Debug|x64.Build.0 = Debug|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Debug|x86.ActiveCfg = Debug|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Debug|x86.Build.0 = Debug|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Release|Any CPU.Build.0 = Release|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Release|x64.ActiveCfg = Release|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Release|x64.Build.0 = Release|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Release|x86.ActiveCfg = Release|Any CPU - {F6206539-038C-410A-86F7-3919D49A28C7}.Release|x86.Build.0 = Release|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Debug|x64.ActiveCfg = Debug|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Debug|x64.Build.0 = Debug|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Debug|x86.ActiveCfg = Debug|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Debug|x86.Build.0 = Debug|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Release|Any CPU.Build.0 = Release|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Release|x64.ActiveCfg = Release|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Release|x64.Build.0 = Release|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Release|x86.ActiveCfg = Release|Any CPU + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1500,7 +1500,7 @@ Global {E025D98E-BD85-474A-98A9-E7F44F392F8E} = {4967DE1B-FEC2-4C2B-8F7F-6262D67C9434} {52CDD110-77DD-4C4D-8C72-4570F6EF20DD} = {7CF63806-4C4F-4C48-8922-A75113975308} {198FFE3B-0346-4856-A6C9-8752D51C4EB3} = {7CF63806-4C4F-4C48-8922-A75113975308} - {F6206539-038C-410A-86F7-3919D49A28C7} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} + {47B6636D-09A3-47AE-9303-9F5D15EEE9D8} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {83786312-A93B-4BB4-AB06-7C6913A59AFA} diff --git a/src/Security/Security.sln b/src/Security/Security.sln index 6979b12024..b2735e5b23 100644 --- a/src/Security/Security.sln +++ b/src/Security/Security.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28407.52 MinimumVisualStudioVersion = 15.0.26730.03 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authorization", "Authorization", "{F6A3381D-978A-4CBF-BC72-862FB75CD6AF}" EndProject @@ -88,8 +88,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagno EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{43AF597A-FCB8-41A5-8279-345FEE9A61AD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{707CBFB4-4D35-479E-9BAF-39B4DA9782DE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{55052FE3-F8C2-4E6C-97B0-C02ED1DBEA62}" @@ -136,6 +134,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routin EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "..\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{71961A8D-B26F-46AE-A475-D00425D875A0}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{FD3AB895-2AF6-447D-82CF-DB002B491D23}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -258,10 +258,6 @@ Global {6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}.Debug|Any CPU.Build.0 = Debug|Any CPU {6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}.Release|Any CPU.ActiveCfg = Release|Any CPU {6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}.Release|Any CPU.Build.0 = Release|Any CPU - {43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Release|Any CPU.Build.0 = Release|Any CPU {707CBFB4-4D35-479E-9BAF-39B4DA9782DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {707CBFB4-4D35-479E-9BAF-39B4DA9782DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {707CBFB4-4D35-479E-9BAF-39B4DA9782DE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -350,6 +346,10 @@ Global {71961A8D-B26F-46AE-A475-D00425D875A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {71961A8D-B26F-46AE-A475-D00425D875A0}.Release|Any CPU.ActiveCfg = Release|Any CPU {71961A8D-B26F-46AE-A475-D00425D875A0}.Release|Any CPU.Build.0 = Release|Any CPU + {FD3AB895-2AF6-447D-82CF-DB002B491D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD3AB895-2AF6-447D-82CF-DB002B491D23}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD3AB895-2AF6-447D-82CF-DB002B491D23}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD3AB895-2AF6-447D-82CF-DB002B491D23}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -394,7 +394,6 @@ Global {B6CA96E4-674A-4616-9A38-DED07BE458E1} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {54CBBAED-36D5-4855-BB4E-D1AE3523AA23} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04} = {A3766414-EB5C-40F7-B031-121804ED5D0A} - {43AF597A-FCB8-41A5-8279-345FEE9A61AD} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {707CBFB4-4D35-479E-9BAF-39B4DA9782DE} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {556C4FAA-F4B1-4EA9-8921-CB1DF7D94C2A} = {55052FE3-F8C2-4E6C-97B0-C02ED1DBEA62} {9F5EE06F-7885-42EB-AC38-FBB61F169320} = {A3766414-EB5C-40F7-B031-121804ED5D0A} @@ -417,6 +416,7 @@ Global {73BCF909-4999-4663-BAE1-36B7734212B7} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {5B2F3890-198E-4BE8-8464-10B4D97F976A} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {71961A8D-B26F-46AE-A475-D00425D875A0} = {A3766414-EB5C-40F7-B031-121804ED5D0A} + {FD3AB895-2AF6-447D-82CF-DB002B491D23} = {A3766414-EB5C-40F7-B031-121804ED5D0A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ABF8089E-43D0-4010-84A7-7A9DCFE49357} From c61639b4a452fc5c7bd01435634ca89dfb8c49ec Mon Sep 17 00:00:00 2001 From: David Fowler Date: Fri, 4 Jan 2019 08:33:57 -0800 Subject: [PATCH 70/80] Reduce HTTP/2 allocations (#6119) - Remove per request allocations on the thread pool by implementing IThreadPoolWorkItem on Http2Stream - Made generic version of Http2Stream to store the IHttpApplication instead of using a tuple - Removed passing of IHttpApplication everywhere --- .../src/Internal/Http2/Http2Connection.cs | 23 ++++++++----------- .../Core/src/Internal/Http2/Http2Stream.cs | 8 ++++++- .../Core/src/Internal/Http2/Http2StreamOfT.cs | 23 +++++++++++++++++++ .../HttpProtocolFeatureCollectionTests.cs | 15 ++++++++++-- 4 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 src/Servers/Kestrel/Core/src/Internal/Http2/Http2StreamOfT.cs diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs index 2dded1c2d1..d80df01e44 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs @@ -415,7 +415,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 case Http2FrameType.WINDOW_UPDATE: return ProcessWindowUpdateFrameAsync(); case Http2FrameType.CONTINUATION: - return ProcessContinuationFrameAsync(application, payload); + return ProcessContinuationFrameAsync(payload); default: return ProcessUnknownFrameAsync(); } @@ -558,7 +558,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 } // Start a new stream - _currentHeadersStream = new Http2Stream(new Http2StreamContext + _currentHeadersStream = new Http2Stream(application, new Http2StreamContext { ConnectionId = ConnectionId, StreamId = _incomingFrame.StreamId, @@ -580,7 +580,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 _headerFlags = _incomingFrame.HeadersFlags; var headersPayload = payload.Slice(0, _incomingFrame.HeadersPayloadLength); // Minus padding - return DecodeHeadersAsync(application, _incomingFrame.HeadersEndHeaders, headersPayload); + return DecodeHeadersAsync(_incomingFrame.HeadersEndHeaders, headersPayload); } } @@ -822,7 +822,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 return Task.CompletedTask; } - private Task ProcessContinuationFrameAsync(IHttpApplication application, ReadOnlySequence payload) + private Task ProcessContinuationFrameAsync(ReadOnlySequence payload) { if (_currentHeadersStream == null) { @@ -847,7 +847,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 TimeoutControl.CancelTimeout(); } - return DecodeHeadersAsync(application, _incomingFrame.ContinuationEndHeaders, payload); + return DecodeHeadersAsync(_incomingFrame.ContinuationEndHeaders, payload); } } @@ -861,7 +861,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 return Task.CompletedTask; } - private Task DecodeHeadersAsync(IHttpApplication application, bool endHeaders, ReadOnlySequence payload) + private Task DecodeHeadersAsync(bool endHeaders, ReadOnlySequence payload) { try { @@ -870,7 +870,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 if (endHeaders) { - StartStream(application); + StartStream(); ResetRequestHeaderParsingState(); } } @@ -896,7 +896,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 return Task.CompletedTask; } - private void StartStream(IHttpApplication application) + private void StartStream() { if (!_isMethodConnect && (_parsedPseudoHeaderFields & _mandatoryRequestPseudoHeaderFields) != _mandatoryRequestPseudoHeaderFields) { @@ -923,12 +923,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 _activeStreamCount++; _streams[_incomingFrame.StreamId] = _currentHeadersStream; // Must not allow app code to block the connection handling loop. - ThreadPool.UnsafeQueueUserWorkItem(state => - { - var (app, currentStream) = (Tuple, Http2Stream>)state; - _ = currentStream.ProcessRequestsAsync(app); - }, - new Tuple, Http2Stream>(application, _currentHeadersStream)); + ThreadPool.UnsafeQueueUserWorkItem(_currentHeadersStream, preferLocal: false); } private void ResetRequestHeaderParsingState() diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs index c51dfcf84c..661c2ae068 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs @@ -6,6 +6,7 @@ using System.Buffers; using System.Diagnostics; using System.IO; using System.IO.Pipelines; +using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; @@ -17,7 +18,7 @@ using Microsoft.Net.Http.Headers; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 { - public partial class Http2Stream : HttpProtocol + public abstract partial class Http2Stream : HttpProtocol, IThreadPoolWorkItem { private readonly Http2StreamContext _context; private readonly Http2OutputProducer _http2Output; @@ -499,6 +500,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 } } + /// + /// Used to kick off the request processing loop by derived classes. + /// + public abstract void Execute(); + [Flags] private enum StreamCompletionFlags { diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2StreamOfT.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2StreamOfT.cs new file mode 100644 index 0000000000..d026b3a288 --- /dev/null +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2StreamOfT.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Microsoft.AspNetCore.Hosting.Server; + +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 +{ + public class Http2Stream : Http2Stream + { + private readonly IHttpApplication _application; + + public Http2Stream(IHttpApplication application, Http2StreamContext context) : base(context) + { + _application = application; + } + + public override void Execute() + { + // REVIEW: Should we store this in a field for easy debugging? + _ = ProcessRequestsAsync(_application); + } + } +} diff --git a/src/Servers/Kestrel/Core/test/HttpProtocolFeatureCollectionTests.cs b/src/Servers/Kestrel/Core/test/HttpProtocolFeatureCollectionTests.cs index 001d3952b3..011fa59fe1 100644 --- a/src/Servers/Kestrel/Core/test/HttpProtocolFeatureCollectionTests.cs +++ b/src/Servers/Kestrel/Core/test/HttpProtocolFeatureCollectionTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests _http1Connection.Reset(); _collection = _http1Connection; - var http2Stream = new Http2Stream(context); + var http2Stream = new TestHttp2Stream(context); http2Stream.Reset(); _http2Collection = http2Stream; } @@ -220,5 +220,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests } private Http1Connection CreateHttp1Connection() => new TestHttp1Connection(_httpConnectionContext); + + private class TestHttp2Stream : Http2Stream + { + public TestHttp2Stream(Http2StreamContext context) : base(context) + { + } + + public override void Execute() + { + } + } } } From 143a727113272e812a97fc6bf7b76779bac002ee Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 4 Jan 2019 09:40:40 -0800 Subject: [PATCH 71/80] Remove AspNetCoreModule virtual projects (#6317) --- build/artifacts.props | 2 - build/repo.props | 2 - eng/targets/ResolveIisReferences.targets | 19 +- .../ANCMIISExpressV1/ancm_iis_express.wxs | 13 +- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 19 +- .../ANCMPackageResolver.csproj | 25 -- .../ANCMV1/aspnetcoremodule.wxs | 13 +- .../ANCMV2/aspnetcoremodulev2.wxs | 21 +- .../Directory.Build.props | 45 +- .../build/settings/debug.props | 2 - .../samples/MusicStore/MusicStore.csproj | 5 - .../Directory.Build.targets | 37 -- ...rosoft.AspNetCore.AspNetCoreModule.pkgproj | 35 -- ...icrosoft.AspNetCore.AspNetCoreModule.props | 8 - .../Microsoft.AspNetCore.AspNetCoreModule/_._ | 0 .../Directory.Build.targets | 36 -- ...osoft.AspNetCore.AspNetCoreModule.props.in | 13 - ...soft.AspNetCore.AspNetCoreModuleV2.pkgproj | 42 -- .../_._ | 0 .../Microsoft.AspNetCore.Server.IIS.csproj | 2 +- ...rwardsCompatibility.FunctionalTests.csproj | 2 - .../IIS.FunctionalTests.csproj | 2 - .../IIS/IIS/test/IIS.Tests/IIS.Tests.csproj | 2 - .../IISExpress.FunctionalTests.csproj | 2 - ...tCore.Server.IntegrationTesting.IIS.csproj | 14 +- src/Servers/IIS/build/assets.props | 386 +++++++++--------- src/Servers/IIS/build/repo.props | 22 - src/Servers/IIS/build/repo.targets | 129 ------ .../IIS/tools/GenerateNativeAssets.ps1 | 2 +- ...t.AspNetCore.Runtime.SiteExtension.pkgproj | 4 +- 30 files changed, 258 insertions(+), 646 deletions(-) delete mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj delete mode 100644 src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets delete mode 100644 src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj delete mode 100644 src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props delete mode 100644 src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/_._ delete mode 100644 src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets delete mode 100644 src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in delete mode 100644 src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj delete mode 100644 src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/_._ delete mode 100644 src/Servers/IIS/build/repo.props delete mode 100644 src/Servers/IIS/build/repo.targets diff --git a/build/artifacts.props b/build/artifacts.props index f8e9e9b507..d69b642bdf 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -94,8 +94,6 @@ This can be done once #4246 is complete, and done in conjunction with converting - - diff --git a/build/repo.props b/build/repo.props index 28b1b9b521..ec96979315 100644 --- a/build/repo.props +++ b/build/repo.props @@ -65,8 +65,6 @@ - - diff --git a/eng/targets/ResolveIisReferences.targets b/eng/targets/ResolveIisReferences.targets index 0449352d7b..4beec3df91 100644 --- a/eng/targets/ResolveIisReferences.targets +++ b/eng/targets/ResolveIisReferences.targets @@ -8,30 +8,13 @@ with the right MSBuild incantations to get output copied to the right place. - - - - - - - - - - - - - - - - - Platform=%(Platform) - %(Platform)\%(HandlerPath)\ + %(Platform)\%(HandlerPath)\ false diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs index 4ffaaa5e94..f4abe4ea34 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs @@ -36,15 +36,6 @@ - - - - - - - - - @@ -200,7 +191,7 @@ diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 62c90523f3..027db61965 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -38,17 +38,6 @@ - - - - - - - - - - - @@ -188,7 +177,7 @@ @@ -218,7 +207,7 @@ @@ -231,7 +220,7 @@ diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj deleted file mode 100644 index 16cace9755..0000000000 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - - netstandard1.0 - true - true - $(RepositoryRoot).deps\ANCM - - - - - - - - - - - $(RestoreSources); - $(RepositoryRoot).deps\ANCM; - - - - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs index e589ae342c..e282a257a9 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs @@ -24,15 +24,6 @@ - - - - - - - - - @@ -173,7 +164,7 @@ diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index de647f5237..3a6662c808 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -24,17 +24,6 @@ - - - - - - - - - - - @@ -163,7 +152,7 @@ @@ -192,7 +181,7 @@ @@ -206,7 +195,7 @@ @@ -308,7 +297,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props index ada3840cee..1725636e1b 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props @@ -3,8 +3,6 @@ - $(PackageVersion) - $(PackageVersion) <_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000)) @@ -31,15 +29,46 @@ $(AspNetCoreSetupRoot)build\ - $(RepositoryRoot).deps\ANCM\Microsoft.AspNetCore.AspNetCoreModule\$(MicrosoftAspNetCoreAspNetCoreModulePackageVersion)\ - $(RepositoryRoot).deps\ANCM\Microsoft.AspNetCore.AspNetCoreModuleV2\$(MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion)\ - $(PreBuiltANCMSchema)contentFiles\any\any\ - $(PreBuiltANCMV2Schema)contentFiles\any\any\ + <_ServerIISBasePath>$(RepositoryRoot)\src\Servers\IIS\ BLDVERMAJOR=$(BLDVERMAJOR);BLDVERMINOR=$(BLDVERMINOR);BLDNUMMAJOR=$(BLDNUMMAJOR);BLDNUMMINOR=$(BLDNUMMINOR);$(DefineConstants) ANCMMsiVersion=$(ANCMMsiVersion);ANCMOutOfProcessNugetPackageHandlerVersion=$(ANCMOutOfProcessNugetPackageHandlerVersion);$(DefineConstants) - PreBuiltANCMRoot=$(PreBuiltANCMRoot);PreBuiltANCMV2Root=$(PreBuiltANCMV2Root);$(DefineConstants) - PreBuiltANCMSchema=$(PreBuiltANCMSchema);PreBuiltANCMV2Schema=$(PreBuiltANCMV2Schema);$(DefineConstants) + + AspNetCoreSchemaPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml; + AspNetCoreMofPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\ancm.mof; + + AspNetCoreV1TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll; + AspNetCoreV1WoW64TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll; + + AspNetCoreV2TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll; + AspNetCoreV2WoW64TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll; + + AspNetCoreV2HandlerTargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_outofprocess.dll; + AspNetCoreV2HandlerWoW64TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll; + + $(DefineConstants) + + + + false + + + false + + + false + + + + false + + + false + + + false + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/debug.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/debug.props index 710f5553d0..f836b47097 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/debug.props +++ b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/debug.props @@ -14,7 +14,6 @@ true Disabled - true EnableFastChecks MultiThreadedDebug @@ -22,7 +21,6 @@ false false true - /JMC- diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj index beaee9e258..c354db8eb1 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -13,11 +13,6 @@ - - - - - diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets deleted file mode 100644 index 9b37939d97..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - false - - false - - false - - true - - true - - false - - false - - $(MSBuildProjectName) - $(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg - - - - - - NuGetPackage - $(PackageId) - $(PackageVersion) - $(PackageSigningCertName) - true - true - - - - diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj deleted file mode 100644 index ef1b44bc18..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - - $(MSBuildProjectName) - false - netcoreapp2.2 - aspnetcore - Microsoft ASP.NET Core Module - true - true - ASP.NET Core Module - false - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props deleted file mode 100644 index 4e6fbe80e8..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcore.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll - - - \ No newline at end of file diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/_._ b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/_._ deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets deleted file mode 100644 index 3ccb87cc94..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - false - - false - - false - - true - - true - - false - - false - - $(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg - - - - - - NuGetPackage - $(PackageId) - $(PackageVersion) - $(PackageSigningCertName) - true - true - - - - diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in deleted file mode 100644 index 7b3be4a261..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModule.props.in +++ /dev/null @@ -1,13 +0,0 @@ - - - - ${AspNetCoreModuleOutOfProcessVersion} - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll - - - \ No newline at end of file diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj deleted file mode 100644 index 1cc9e02ba9..0000000000 --- a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - - $(MSBuildProjectName) - false - netcoreapp2.2 - aspnetcore - Microsoft ASP.NET Core Module - true - true - ASP.NET Core Module - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/_._ b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/_._ deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj index 897ebe80cd..985d1af857 100644 --- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj index 9da5c35404..0d568e16e3 100644 --- a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj @@ -24,8 +24,6 @@ - - diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 9f311d3264..91d014099e 100644 --- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -24,8 +24,6 @@ - - diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj index 85af44807e..eb7d5e8539 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj @@ -12,8 +12,6 @@ - - diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 2fb4c01737..ddb613fda7 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -24,8 +24,6 @@ - - diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index fad9d07dea..86c6741dc0 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -11,6 +11,7 @@ true true true + 2.0.0 @@ -31,9 +32,9 @@ - - - + + + @@ -42,6 +43,13 @@ + + + + + + + diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props index f05a8f5251..20b2d7125e 100644 --- a/src/Servers/IIS/build/assets.props +++ b/src/Servers/IIS/build/assets.props @@ -9,263 +9,261 @@ - $(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll - $(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll - $(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll + $(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll + $(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll + $(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll $(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll diff --git a/src/Servers/IIS/build/repo.props b/src/Servers/IIS/build/repo.props deleted file mode 100644 index 727a2e970f..0000000000 --- a/src/Servers/IIS/build/repo.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - false - - - - - true - - 2.0.0 - - $(BuildDir)StressTestWebSite.zip - - - - - - - diff --git a/src/Servers/IIS/build/repo.targets b/src/Servers/IIS/build/repo.targets deleted file mode 100644 index 12023b84c4..0000000000 --- a/src/Servers/IIS/build/repo.targets +++ /dev/null @@ -1,129 +0,0 @@ - - - - $(PrepareDependsOn) - $(GetArtifactInfoDependsOn);GetNativeArtifactsInfo - BuildNativeAssets;$(CompileDependsOn) - $(PackageDependsOn);PackageNativeProjects - $(TestDependsOn);RunNativeTest - $(RepositoryRoot)NuGetPackageVerifier.xplat.json - $(RepositoryRoot)src\ - bin\$(Configuration)\ - - - - - - - - - - - -p:Configuration=Native$(Configuration) -v:m -nologo -clp:NoSummary -p:CommitHash=$(CommitHash) -m - - - - - - - - - - - - - - $(ProductPackageOutputPath)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg - $(ProductPackageOutputPath)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg - - - - - NuGetPackage - Microsoft.AspNetCore.AspNetCoreModule - $(PackageVersion) - $(RepositoryRoot) - - - - - - NuGetPackage - Microsoft.AspNetCore.AspNetCoreModuleV2 - $(PackageVersion) - $(RepositoryRoot) - - - - - - - - - - $(MSBuildThisFileDirectory)..\nuget\Microsoft.AspNetCore.AspNetCoreModuleV2.props.in - $(MSBuildThisFileDirectory)..\artifacts\Microsoft.AspNetCore.AspNetCoreModuleV2.props - - - - - - - - - - - - - - - - - - - - - - - -p:Configuration=$(Configuration) -v:m -nologo -clp:NoSummary - - - - - - - $(MSBuildThisFileDirectory)..\test\WebSites\StressTestWebSite\ - $(StressAppBasePath)bin\published\ - - - - - - - - - - - - diff --git a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 index f4b98959ed..7f02d34a44 100644 --- a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 +++ b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 @@ -10,7 +10,7 @@ $platforms = @( VCPlatform = "Win32"; } ); -$srcDir = "`$(MSBuildThisFileDirectory)..\src"; +$srcDir = "`$(MSBuildThisFileDirectory).."; $projects = @( @{ ProjectDirectory = "$srcDir\AspNetCoreModuleV1\AspNetCore"; diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj index fb9cd35046..5ca77d6880 100644 --- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj +++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj @@ -27,8 +27,8 @@ - - + + From 69b5ab9c015cfa5ee33c0f12151a90998ebfcefb Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Thu, 3 Jan 2019 12:51:40 -0800 Subject: [PATCH 72/80] React to JwtBearer removal from Microsoft.AspNetCore.App nits: - remove NET461 special case - remove reference to transitive Mvc.Core dependency --- .../benchmarkapps/BasicApi/BasicApi.csproj | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj index ee86ba6e1d..fc84deb124 100644 --- a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj +++ b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj @@ -11,39 +11,34 @@ - - - - - - - + + + - + - - - - + + - + + + + + From d689eede3685ec9c7bb2edb61cefe1fc6874170f Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Wed, 2 Jan 2019 10:52:53 -0800 Subject: [PATCH 73/80] Revert "Work around `CryptographicException`s thrown in some full framework test runs" - no longer support .NET Framework This reverts commit 192e8073ee --- .../BasicApiTest.cs | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs index 289eb16f92..42d2a5a5ce 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs @@ -5,7 +5,6 @@ using System.Net; using System.Net.Http; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Net.Http.Headers; using Xunit; @@ -57,9 +56,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); } - // Tests are conditional to avoid occasional CI failures on Windows 8 and Windows 2012 under full framework. - [ConditionalFact] - [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")] + [Fact] public async Task Token_WithKnownUser_ReturnsOkAndToken() { // Arrange & Act @@ -84,8 +81,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); } - [ConditionalTheory] - [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")] + [Theory] [InlineData("reader@example.com")] [InlineData("writer@example.com")] public async Task FindByStatus_WithToken_ReturnsOkAndPet(string username) @@ -112,8 +108,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.NotEmpty(json); } - [ConditionalFact] - [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")] + [Fact] public async Task FindById_WithInvalidPetId_ReturnsNotFound() { // Arrange & Act 1 @@ -133,8 +128,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); } - [ConditionalFact] - [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")] + [Fact] public async Task FindById_WithValidPetId_ReturnsOkAndPet() { // Arrange & Act 1 @@ -159,8 +153,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.NotEmpty(json); } - [ConditionalFact] - [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")] + [Fact] public async Task AddPet_WithInsufficientClaims_ReturnsForbidden() { // Arrange & Act 1 @@ -192,8 +185,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); } - [ConditionalFact] - [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")] + [Fact] public async Task AddPet_WithValidClaims_ReturnsCreated() { // Arrange & Act 1 From 436076fd551fdc6e24565381211ad3c5ebd7b589 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 4 Jan 2019 10:00:26 -0800 Subject: [PATCH 74/80] Fix broken tests and VS solutions caused by source code reorganization and other build infra cleanup Changes: * Fix broken tests and VS solutions caused by source code reorganization * Add a check to validate generated code and solutions on PRs * backport some source code reorg to src/Identity * Fix startvs.cmd if you've already run build.ps1 * Add PR checks for tests on Linux/macOS * Skip broken Nginx tests * Add conditions to skip IIS tests on non-Windows platforms --- .azure/pipelines/ci.yml | 10 + .azure/pipelines/pr-validation-temp.yml | 8 + Directory.Build.props | 2 + build/repo.props | 5 +- eng/ProjectReferences.props | 12 +- eng/scripts/CodeCheck.ps1 | 69 ++ eng/scripts/common.psm1 | 74 ++ korebuild-lock.txt | 4 +- src/Azure/Azure.sln | 2 +- ...hentication.AzureAD.FunctionalTests.csproj | 3 +- .../Core/src/AspNetRoleManager.cs | 0 .../Core/src/AspNetUserManager.cs | 0 .../Core/src/BuilderExtensions.cs | 0 .../Core/src/DataProtectionTokenProvider.cs | 0 .../src/DataProtectionTokenProviderOptions.cs | 0 .../Core/src/ExternalLoginInfo.cs | 0 .../Core/src/ISecurityStampValidator.cs | 0 .../src/ITwoFactorSecurityStampValidator.cs | 0 .../Core/src/IdentityBuilderExtensions.cs | 0 .../Core/src/IdentityConstants.cs | 0 .../Core/src/IdentityCookiesBuilder.cs | 0 .../src/IdentityCookiesBuilderExtensions.cs | 0 .../IdentityServiceCollectionExtensions.cs | 0 .../src/Microsoft.AspNetCore.Identity.csproj | 0 .../Core/src/Properties/AssemblyInfo.cs | 0 .../Core/src/Properties/Resources.Designer.cs | 0 .../Core/src/Properties/debugSettings.json | 0 .../{Identity => }/Core/src/Resources.resx | 0 ...SecurityStampRefreshingPrincipalContext.cs | 0 .../Core/src/SecurityStampValidator.cs | 0 .../Core/src/SecurityStampValidatorOptions.cs | 0 .../{Identity => }/Core/src/SignInManager.cs | 0 .../src/TwoFactorSecurityStampValidator.cs | 0 .../Core/src/baseline.netcore.json | 0 .../Core/src/baseline.netframework.json | 0 src/Identity/Directory.Build.props | 8 + .../src/IdentityDbContext.cs | 0 ...dentityEntityFrameworkBuilderExtensions.cs | 0 .../src/IdentityUserContext.cs | 0 ...etCore.Identity.EntityFrameworkCore.csproj | 0 .../src/Properties/Resources.Designer.cs | 0 .../src/Resources.resx | 0 .../src/RoleStore.cs | 0 .../src/UserOnlyStore.cs | 0 .../src/UserStore.cs | 0 .../src/baseline.netcore.json | 0 .../test/EF.InMemory.Test/InMemoryContext.cs | 0 .../InMemoryEFOnlyUsersTest.cs | 0 .../InMemoryEFUserStoreTest.cs | 0 .../InMemoryStoreWithGenericsTest.cs | 0 ...y.EntityFrameworkCore.InMemory.Test.csproj | 2 +- .../test/EF.InMemory.Test/RoleStoreTest.cs | 0 .../EF.InMemory.Test/TestIdentityFactory.cs | 0 .../test/EF.Test/ApiConsistencyTest.cs | 0 .../test/EF.Test/CustomPocoTest.cs | 0 .../test/EF.Test/DbUtil.cs | 0 .../test/EF.Test/DefaultPocoTest.cs | 0 .../test/EF.Test/MaxKeyLengthSchemaTest.cs | 0 ...e.Identity.EntityFrameworkCore.Test.csproj | 5 +- .../test/EF.Test/SqlStoreOnlyUsersTestBase.cs | 0 .../test/EF.Test/SqlStoreTestBase.cs | 0 .../test/EF.Test/UserOnlyCustomContextTest.cs | 0 .../test/EF.Test/UserOnlyTest.cs | 0 .../UserStoreEncryptPersonalDataTest.cs | 0 .../test/EF.Test/UserStoreGuidKeyTest.cs | 0 .../test/EF.Test/UserStoreIntKeyTest.cs | 0 .../test/EF.Test/UserStoreStringKeyTest.cs | 0 .../test/EF.Test/UserStoreTest.cs | 0 .../test/EF.Test/UserStoreWithGenericsTest.cs | 0 .../Utilities/ScratchDatabaseFixture.cs | 0 .../EF.Test/Utilities/SqlServerTestStore.cs | 0 .../test/EF.Test/Utilities/TestEnvironment.cs | 0 .../test/EF.Test/config.json | 0 .../src/AuthenticatorTokenProvider.cs | 0 .../Core => Extensions.Core}/src/Base32.cs | 0 .../src/ClaimsIdentityOptions.cs | 0 .../src/DefaultPersonalDataProtector.cs | 0 .../src/EmailTokenProvider.cs | 0 .../src/ILookupNormalizer.cs | 0 .../src/ILookupProtector.cs | 0 .../src/ILookupProtectorKeyRing.cs | 0 .../src/IPasswordHasher.cs | 0 .../src/IPasswordValidator.cs | 0 .../src/IPersonalDataProtector.cs | 0 .../src/IProtectedUserStore.cs | 0 .../src/IQueryableRoleStore.cs | 0 .../src/IQueryableUserStore.cs | 0 .../src/IRoleClaimStore.cs | 0 .../src/IRoleStore.cs | 0 .../src/IRoleValidator.cs | 0 .../src/IUserAuthenticationTokenStore.cs | 0 .../src/IUserAuthenticatorKeyStore.cs | 0 .../src/IUserClaimStore.cs | 0 .../src/IUserClaimsPrincipalFactory.cs | 0 .../src/IUserEmailStore.cs | 0 .../src/IUserLockoutStore.cs | 0 .../src/IUserLoginStore.cs | 0 .../src/IUserPasswordStore.cs | 0 .../src/IUserPhoneNumberStore.cs | 0 .../src/IUserRoleStore.cs | 0 .../src/IUserSecurityStampStore.cs | 0 .../src/IUserStore.cs | 0 .../src/IUserTwoFactorRecoveryCodeStore.cs | 0 .../src/IUserTwoFactorStore.cs | 0 .../src/IUserTwoFactorTokenProvider.cs | 0 .../src/IUserValidator.cs | 0 .../src/IdentityBuilder.cs | 0 .../src/IdentityError.cs | 0 .../src/IdentityErrorDescriber.cs | 0 .../src/IdentityOptions.cs | 0 .../src/IdentityResult.cs | 0 .../IdentityServiceCollectionExtensions.cs | 0 .../src/LockoutOptions.cs | 0 .../Microsoft.Extensions.Identity.Core.csproj | 0 .../src/PasswordHasher.cs | 0 .../src/PasswordHasherCompatibilityMode.cs | 0 .../src/PasswordHasherOptions.cs | 0 .../src/PasswordOptions.cs | 0 .../src/PasswordValidator.cs | 0 .../src/PasswordVerificationResult.cs | 0 .../src/PersonalDataAttribute.cs | 0 .../src/PhoneNumberTokenProvider.cs | 0 .../src/PrincipalExtensions.cs | 0 .../src/Properties/AssemblyInfo.cs | 0 .../src/Properties/Resources.Designer.cs | 0 .../src/ProtectedPersonalDataAttribute.cs | 0 .../src/Resources.resx | 0 .../src/Rfc6238AuthenticationService.cs | 0 .../src/RoleManager.cs | 0 .../src/RoleValidator.cs | 0 .../src/SignInOptions.cs | 0 .../src/SignInResult.cs | 0 .../src/StoreOptions.cs | 0 .../src/TokenOptions.cs | 0 .../src/TokenProviderDescriptor.cs | 0 .../TotpSecurityStampBasedTokenProvider.cs | 0 .../src/UpperInvariantLookupNormalizer.cs | 0 .../src/UserClaimsPrincipalFactory.cs | 0 .../src/UserLoginInfo.cs | 0 .../src/UserManager.cs | 0 .../src/UserOptions.cs | 0 .../src/UserValidator.cs | 0 .../src/baseline.netcore.json | 0 .../src/IdentityRole.cs | 0 .../src/IdentityRoleClaim.cs | 0 .../src/IdentityUser.cs | 0 .../src/IdentityUserClaim.cs | 0 .../src/IdentityUserLogin.cs | 0 .../src/IdentityUserRole.cs | 0 .../src/IdentityUserToken.cs | 0 ...icrosoft.Extensions.Identity.Stores.csproj | 0 .../src/RoleStoreBase.cs | 0 .../src/UserStoreBase.cs | 0 .../src/baseline.netcore.json | 0 src/Identity/Identity.sln | 1045 +++++++++-------- src/Identity/IdentityCore.sln | 693 ----------- src/Identity/{Identity => }/README.md | 0 .../src/IdentityResultAssert.cs | 0 .../src/IdentitySpecificationTestBase.cs | 0 ...etCore.Identity.Specification.Tests.csproj | 0 .../Specification.Tests/src/TestLogger.cs | 0 .../src/UserManagerSpecificationTests.cs | 0 .../src/baseline.netcore.json | 0 .../Filters/ExternalLoginsPageFilter.cs | 0 .../Pages/Account/AccessDenied.cshtml | 0 .../Pages/Account/AccessDenied.cshtml.cs | 0 .../Pages/Account/ConfirmEmail.cshtml | 0 .../Pages/Account/ConfirmEmail.cshtml.cs | 0 .../Pages/Account/ExternalLogin.cshtml | 0 .../Pages/Account/ExternalLogin.cshtml.cs | 0 .../Pages/Account/ForgotPassword.cshtml | 0 .../Pages/Account/ForgotPassword.cshtml.cs | 0 .../Account/ForgotPasswordConfirmation.cshtml | 0 .../ForgotPasswordConfirmation.cshtml.cs | 0 .../Identity/Pages/Account/Lockout.cshtml | 0 .../Identity/Pages/Account/Lockout.cshtml.cs | 0 .../Areas/Identity/Pages/Account/Login.cshtml | 0 .../Identity/Pages/Account/Login.cshtml.cs | 0 .../Pages/Account/LoginWith2fa.cshtml | 0 .../Pages/Account/LoginWith2fa.cshtml.cs | 0 .../Account/LoginWithRecoveryCode.cshtml | 0 .../Account/LoginWithRecoveryCode.cshtml.cs | 0 .../Identity/Pages/Account/Logout.cshtml | 0 .../Identity/Pages/Account/Logout.cshtml.cs | 0 .../Account/Manage/ChangePassword.cshtml | 0 .../Account/Manage/ChangePassword.cshtml.cs | 0 .../Account/Manage/DeletePersonalData.cshtml | 0 .../Manage/DeletePersonalData.cshtml.cs | 0 .../Pages/Account/Manage/Disable2fa.cshtml | 0 .../Pages/Account/Manage/Disable2fa.cshtml.cs | 0 .../Manage/DownloadPersonalData.cshtml | 0 .../Manage/DownloadPersonalData.cshtml.cs | 0 .../Account/Manage/EnableAuthenticator.cshtml | 0 .../Manage/EnableAuthenticator.cshtml.cs | 0 .../Account/Manage/ExternalLogins.cshtml | 0 .../Account/Manage/ExternalLogins.cshtml.cs | 0 .../Manage/GenerateRecoveryCodes.cshtml | 0 .../Manage/GenerateRecoveryCodes.cshtml.cs | 0 .../Pages/Account/Manage/Index.cshtml | 0 .../Pages/Account/Manage/Index.cshtml.cs | 0 .../Pages/Account/Manage/ManageNavPages.cs | 0 .../Pages/Account/Manage/PersonalData.cshtml | 0 .../Account/Manage/PersonalData.cshtml.cs | 0 .../Account/Manage/ResetAuthenticator.cshtml | 0 .../Manage/ResetAuthenticator.cshtml.cs | 0 .../Pages/Account/Manage/SetPassword.cshtml | 0 .../Account/Manage/SetPassword.cshtml.cs | 0 .../Account/Manage/ShowRecoveryCodes.cshtml | 0 .../Manage/ShowRecoveryCodes.cshtml.cs | 0 .../Manage/TwoFactorAuthentication.cshtml | 0 .../Manage/TwoFactorAuthentication.cshtml.cs | 0 .../Pages/Account/Manage/_Layout.cshtml | 0 .../Pages/Account/Manage/_ManageNav.cshtml | 0 .../Account/Manage/_StatusMessage.cshtml | 0 .../Pages/Account/Manage/_ViewImports.cshtml | 0 .../Pages/Account/Manage/_ViewStart.cshtml | 0 .../Identity/Pages/Account/Register.cshtml | 0 .../Identity/Pages/Account/Register.cshtml.cs | 0 .../Pages/Account/ResetPassword.cshtml | 0 .../Pages/Account/ResetPassword.cshtml.cs | 0 .../Account/ResetPasswordConfirmation.cshtml | 0 .../ResetPasswordConfirmation.cshtml.cs | 0 .../Pages/Account/_ViewImports.cshtml | 0 .../UI/src/Areas/Identity/Pages/Error.cshtml | 0 .../src/Areas/Identity/Pages/Error.cshtml.cs | 0 .../src/Areas/Identity/Pages/_Layout.cshtml | 0 .../Pages/_ValidationScriptsPartial.cshtml | 0 .../Areas/Identity/Pages/_ViewImports.cshtml | 0 .../Areas/Identity/Pages/_ViewStart.cshtml | 0 .../Areas/Identity/Services/EmailSender.cs | 0 .../Areas/Identity/Services/IEmailSender.cs | 0 .../UI/src/IdentityBuilderUIExtensions.cs | 0 .../UI/src/IdentityDefaultUIAttribute.cs | 0 .../src/IdentityDefaultUIConfigureOptions.cs | 0 .../UI/src/IdentityPageModelConvention.cs | 0 .../IdentityServiceCollectionUIExtensions.cs | 0 .../Microsoft.AspNetCore.Identity.UI.csproj | 0 .../{Identity => }/UI/src/THIRD-PARTY-NOTICES | 0 .../UI/src/baseline.netcore.json | 0 .../UI/src/wwwroot/Identity/css/site.css | 0 .../UI/src/wwwroot/Identity/css/site.min.css | 0 .../UI/src/wwwroot/Identity/js/site.js | 0 .../UI/src/wwwroot/Identity/js/site.min.js | 0 .../Identity/lib/bootstrap/.bower.json | 0 .../wwwroot/Identity/lib/bootstrap/LICENSE | 0 .../bootstrap/dist/css/bootstrap-theme.css | 0 .../dist/css/bootstrap-theme.css.map | 0 .../dist/css/bootstrap-theme.min.css | 0 .../dist/css/bootstrap-theme.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.min.css | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../lib/bootstrap/dist/js/bootstrap.js | 0 .../lib/bootstrap/dist/js/bootstrap.min.js | 0 .../Identity/lib/bootstrap/dist/js/npm.js | 0 .../jquery-validation-unobtrusive/.bower.json | 0 .../jquery-validation-unobtrusive/LICENSE.txt | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../lib/jquery-validation/.bower.json | 0 .../Identity/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../dist/additional-methods.min.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../dist/jquery.validate.min.js | 0 .../wwwroot/Identity/lib/jquery/.bower.json | 0 .../wwwroot/Identity/lib/jquery/LICENSE.txt | 0 .../Identity/lib/jquery/dist/jquery.js | 0 .../Identity/lib/jquery/dist/jquery.min.js | 0 .../Identity/lib/jquery/dist/jquery.min.map | 0 src/Identity/build.cmd | 3 + .../Pages/Account/Manage/Index.cshtml | 0 .../Pages/Account/Manage/Index.cshtml.cs | 0 .../Identity/Pages/Account/Register.cshtml | 0 .../Identity/Pages/Account/Register.cshtml.cs | 0 .../Areas/Identity/Pages/_ViewImports.cshtml | 0 .../Areas/Identity/Pages/_ViewStart.cshtml | 0 .../Controllers/HomeController.cs | 0 .../Data/ApplicationDbContext.cs | 0 .../Data/ApplicationUser.cs | 0 ...126174859_CreateIdentitySchema.Designer.cs | 0 .../20180126174859_CreateIdentitySchema.cs | 0 .../ApplicationDbContextModelSnapshot.cs | 0 .../IdentitySample.DefaultUI.csproj | 0 .../IdentitySample.DefaultUI/Program.cs | 0 .../IdentitySample.DefaultUI/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/Shared/_LoginPartial.cshtml | 0 .../Shared/_ValidationScriptsPartial.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../IdentitySample.DefaultUI/appsettings.json | 0 .../IdentitySample.DefaultUI/web.Debug.config | 0 .../web.Release.config | 0 .../IdentitySample.DefaultUI/web.config | 0 .../wwwroot/css/site.css | 0 .../wwwroot/css/site.min.css | 0 .../wwwroot/favicon.ico | Bin .../wwwroot/js/site.js | 0 .../wwwroot/js/site.min.js | 0 .../Controllers/AccountController.cs | 0 .../Controllers/HomeController.cs | 0 .../Controllers/ManageController.cs | 0 .../IdentitySample.Mvc/CopyAspNetLoader.cmd | 0 ...000000000_CreateIdentitySchema.Designer.cs | 0 .../00000000000000_CreateIdentitySchema.cs | 0 .../ApplicationDbContextModelSnapshot.cs | 0 .../IdentitySample.Mvc.csproj | 0 .../IdentitySample.Mvc/MessageServices.cs | 0 .../ExternalLoginConfirmationViewModel.cs | 0 .../ForgotPasswordViewModel.cs | 0 .../AccountViewModels/LoginViewModel.cs | 0 .../AccountViewModels/RegisterViewModel.cs | 0 .../ResetPasswordViewModel.cs | 0 .../AccountViewModels/SendCodeViewModel.cs | 0 .../UseRecoveryCodeViewModel.cs | 0 .../VerifyAuthenticatorCodeViewModel.cs | 0 .../AccountViewModels/VerifyCodeViewModel.cs | 0 .../Models/ApplicationDbContext.cs | 0 .../Models/ApplicationUser.cs | 0 .../AddPhoneNumberViewModel.cs | 0 .../ChangePasswordViewModel.cs | 0 .../ConfigureTwoFactorViewModel.cs | 0 .../DisplayRecoveryCodesViewModel.cs | 0 .../ManageViewModels/FactorViewModel.cs | 0 .../Models/ManageViewModels/IndexViewModel.cs | 0 .../ManageViewModels/ManageLoginsViewModel.cs | 0 .../ManageViewModels/RemoveLoginViewModel.cs | 0 .../ManageViewModels/SetPasswordViewModel.cs | 0 .../VerifyPhoneNumberViewModel.cs | 0 .../samples/IdentitySample.Mvc/Program.cs | 0 .../Services/IEmailSender.cs | 0 .../IdentitySample.Mvc/Services/ISmsSender.cs | 0 .../Services/MessageServices.cs | 0 .../samples/IdentitySample.Mvc/Startup.cs | 0 .../Views/Account/ConfirmEmail.cshtml | 0 .../Account/ExternalLoginConfirmation.cshtml | 0 .../Views/Account/ExternalLoginFailure.cshtml | 0 .../Views/Account/ForgotPassword.cshtml | 0 .../Account/ForgotPasswordConfirmation.cshtml | 0 .../Views/Account/Lockout.cshtml | 0 .../Views/Account/Login.cshtml | 0 .../Views/Account/Register.cshtml | 0 .../Views/Account/ResetPassword.cshtml | 0 .../Account/ResetPasswordConfirmation.cshtml | 0 .../Views/Account/SendCode.cshtml | 0 .../Views/Account/UseRecoveryCode.cshtml | 0 .../Account/VerifyAuthenticatorCode.cshtml | 0 .../Views/Account/VerifyCode.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Manage/AddPhoneNumber.cshtml | 0 .../Views/Manage/ChangePassword.cshtml | 0 .../Views/Manage/DisplayRecoveryCodes.cshtml | 0 .../Views/Manage/Index.cshtml | 0 .../Views/Manage/ManageLogins.cshtml | 0 .../Views/Manage/SetPassword.cshtml | 0 .../Views/Manage/VerifyPhoneNumber.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/Shared/_LoginPartial.cshtml | 0 .../Shared/_ValidationScriptsPartial.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../IdentitySample.Mvc/appsettings.json | 0 .../IdentitySample.Mvc/web.Debug.config | 0 .../IdentitySample.Mvc/web.Release.config | 0 .../samples/IdentitySample.Mvc/web.config | 0 .../IdentitySample.Mvc/wwwroot/css/site.css | 0 .../IdentitySample.Mvc/wwwroot/favicon.ico | Bin .../IdentitySample.Mvc/wwwroot/js/site.js | 0 .../samples/NativeWPFClient/App.config | 0 .../samples/NativeWPFClient/App.xaml | 0 .../samples/NativeWPFClient/App.xaml.cs | 0 .../samples/NativeWPFClient/MainWindow.xaml | 0 .../NativeWPFClient/MainWindow.xaml.cs | 0 .../NativeWPFClient/NativeWPFClient.csproj | 4 +- .../Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../NativeWPFClient/Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../Properties/Settings.settings | 0 src/Identity/startvs.cmd | 3 + .../ApplicationUserAuthorizationTests.cs | 0 .../ApplicationUserLoginTests.cs | 0 .../ApplicationUserManagementTests.cs | 0 .../ApplicationUserRegistrationTests.cs | 0 .../AuthorizationTests.cs | 0 .../Extensions/HtmlAssert.cs | 0 .../Extensions/HttpClientExtensions.cs | 0 .../Extensions/ResponseAssert.cs | 0 .../IdentityUserAuthorizationTests.cs | 0 .../IdentityUserLoginTests.cs | 0 .../IdentityUserManagementTests.cs | 0 .../IdentityUserRegistrationTests.cs | 0 .../Infrastructure/DefaultUIContext.cs | 0 .../Infrastructure/DefaultUIPage.cs | 0 ...ctionalTestsServiceCollectionExtensions.cs | 0 .../Infrastructure/HtmlPage.cs | 0 .../Infrastructure/HtmlPageContext.cs | 0 .../Infrastructure/ServerFactory.cs | 0 .../Identity.FunctionalTests/LoginTests.cs | 0 .../ManagementTests.cs | 0 ...AspNetCore.Identity.FunctionalTests.csproj | 12 +- .../NoIdentityAddedTests.cs | 0 .../Pages/Account/ConfirmEmail.cs | 0 .../Pages/Account/ExternalLogin.cs | 0 .../Pages/Account/ForgotPassword.cs | 0 .../Account/ForgotPasswordConfirmation.cs | 0 .../Pages/Account/Login.cs | 0 .../Pages/Account/LoginWith2fa.cs | 0 .../Pages/Account/LoginWithRecoveryCode.cs | 0 .../Pages/Account/Manage/ChangePassword.cs | 0 .../Pages/Account/Manage/DeleteUser.cs | 0 .../Account/Manage/EnableAuthenticator.cs | 0 .../Pages/Account/Manage/Index.cs | 0 .../Pages/Account/Manage/LinkExternalLogin.cs | 0 .../Account/Manage/ManageExternalLogin.cs | 0 .../Pages/Account/Manage/PersonalData.cs | 0 .../Account/Manage/RemoveExternalLogin.cs | 0 .../Account/Manage/ResetAuthenticator.cs | 0 .../Pages/Account/Manage/SetPassword.cs | 0 .../Pages/Account/Manage/ShowRecoveryCodes.cs | 0 .../Account/Manage/TwoFactorAuthentication.cs | 0 .../Pages/Account/Register.cs | 0 .../Pages/Account/ResetPassword.cs | 0 .../Account/ResetPasswordConfirmation.cs | 0 .../Pages/Contoso/Login.cs | 0 .../Identity.FunctionalTests/Pages/Index.cs | 0 .../PocoUserAuthorizationTests.cs | 0 .../PocoUserTests/PocoUserLoginTests.cs | 0 .../PocoUserTests/PocoUserManagementTests.cs | 0 .../PocoUserRegistrationTests.cs | 0 .../RegistrationTests.cs | 0 .../Identity.FunctionalTests/UserStories.cs | 0 .../xunit.runner.json | 0 .../test/Identity.Test/ApiConsistencyTest.cs | 0 .../Identity.Test/CdnScriptTaghelperTests.cs | 6 +- .../test/Identity.Test/IdentityBuilderTest.cs | 0 .../test/Identity.Test/IdentityOptionsTest.cs | 0 .../test/Identity.Test/IdentityResultTest.cs | 0 .../Microsoft.AspNetCore.Identity.Test.csproj | 2 +- .../test/Identity.Test/NoopRoleStore.cs | 0 .../test/Identity.Test/NoopUserStore.cs | 0 .../test/Identity.Test/PasswordHasherTest.cs | 0 .../Identity.Test/PasswordValidatorTest.cs | 0 .../Identity.Test/PrincipalExtensionsTest.cs | 0 .../test/Identity.Test/RoleManagerTest.cs | 0 .../test/Identity.Test/RoleValidatorTest.cs | 0 .../SecurityStampValidatorTest.cs | 0 .../test/Identity.Test/SignInManagerTest.cs | 0 .../UserClaimsPrincipalFactoryTest.cs | 0 .../test/Identity.Test/UserManagerTest.cs | 0 .../test/Identity.Test/UserValidatorTest.cs | 0 .../test/InMemory.Test/ControllerTest.cs | 0 .../test/InMemory.Test/FunctionalTest.cs | 0 .../test/InMemory.Test/InMemoryStore.cs | 0 .../test/InMemory.Test/InMemoryStoreTest.cs | 0 .../test/InMemory.Test/InMemoryUserStore.cs | 0 .../InMemory.Test/InMemoryUserStoreTest.cs | 0 ...t.AspNetCore.Identity.InMemory.Test.csproj | 2 +- .../test/InMemory.Test/TestClock.cs | 0 .../Shared/ApiConsistencyTestBase.cs | 0 src/Identity/{ => test}/Shared/MockHelpers.cs | 0 .../Shared/PocoModel}/PocoRole.cs | 0 .../Shared/PocoModel}/PocoRoleClaim.cs | 0 .../Shared/PocoModel}/PocoUser.cs | 0 .../Shared/PocoModel}/PocoUserClaim.cs | 0 .../Shared/PocoModel}/PocoUserLogin.cs | 0 .../Shared/PocoModel}/PocoUserRole.cs | 0 .../Shared/PocoModel}/PocoUserToken.cs | 0 .../{ => test}/Shared/PriorityOrderer.cs | 0 .../ApplicationUserStartup.cs | 0 .../Data/ApplicationDbContext.cs | 0 .../Data/ApplicationUser.cs | 0 ...000000000_CreateIdentitySchema.Designer.cs | 0 .../00000000000000_CreateIdentitySchema.cs | 0 ...217170630_UpdateIdentitySchema.Designer.cs | 0 .../20180217170630_UpdateIdentitySchema.cs | 0 .../IdentityDbContextModelSnapshot.cs | 0 .../Identity.DefaultUI.WebSite.csproj | 6 +- .../NoIdentityStartup.cs | 0 .../Pages/About.cshtml | 0 .../Pages/About.cshtml.cs | 0 .../Pages/Contact.cshtml | 0 .../Pages/Contact.cshtml.cs | 0 .../Pages/Contoso/Login.cshtml | 0 .../Pages/Contoso/Login.cshtml.cs | 0 .../Pages/Error.cshtml | 0 .../Pages/Error.cshtml.cs | 0 .../Pages/Index.cshtml | 0 .../Pages/Index.cshtml.cs | 0 .../Pages/Privacy.cshtml | 0 .../Pages/Privacy.cshtml.cs | 0 .../Pages/Shared/_LoginPartial.cshtml | 0 .../Pages/_CookieConsentPartial.cshtml | 0 .../Pages/_Layout.cshtml | 0 .../Pages/_ValidationScriptsPartial.cshtml | 0 .../Pages/_ViewImports.cshtml | 0 .../Pages/_ViewStart.cshtml | 0 .../Identity.DefaultUI.WebSite/PocoUser.cs | 0 .../PocoUserStartup.cs | 0 .../Identity.DefaultUI.WebSite/Program.cs | 0 .../ContosoAuthenticationBuilderExtensions.cs | 0 .../ContosoAuthenticationConstants.cs | 0 .../Services/ContosoAuthenticationHandler.cs | 0 .../Services/ContosoAuthenticationOptions.cs | 0 .../Services/ContosoEmailSender.cs | 0 .../Services/IdentityEmail.cs | 0 .../Identity.DefaultUI.WebSite/Startup.cs | 0 .../Identity.DefaultUI.WebSite/StartupBase.cs | 0 .../appsettings.Development.json | 0 .../appsettings.json | 0 .../bundleconfig.json | 0 .../wwwroot/css/site.css | 0 .../wwwroot/css/site.min.css | 0 .../wwwroot/favicon.ico | Bin .../wwwroot/images/banner1.svg | 0 .../wwwroot/images/banner2.svg | 0 .../wwwroot/images/banner3.svg | 0 .../wwwroot/images/banner4.svg | 0 .../wwwroot/js/site.js | 0 .../wwwroot/js/site.min.js | 0 .../wwwroot/lib/bootstrap/.bower.json | 0 .../wwwroot/lib/bootstrap/LICENSE | 0 .../bootstrap/dist/css/bootstrap-theme.css | 0 .../dist/css/bootstrap-theme.css.map | 0 .../dist/css/bootstrap-theme.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../lib/bootstrap/dist/js/bootstrap.js | 0 .../wwwroot/lib/bootstrap/dist/js/npm.js | 0 .../jquery-validation-unobtrusive/.bower.json | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../wwwroot/lib/jquery-validation/.bower.json | 0 .../wwwroot/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../wwwroot/lib/jquery/.bower.json | 0 .../wwwroot/lib/jquery/LICENSE.txt | 0 .../wwwroot/lib/jquery/dist/jquery.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.map | 0 ...soft.AspNetCore.Mvc.FunctionalTests.csproj | 2 +- src/Security/Security.sln | 2 +- src/Servers/FunctionalTests.sln | 2 +- .../IISIntegration.FunctionalTests.csproj | 2 + .../OutOfProcess/HelloWorldTest.cs | 5 +- .../FunctionalTests/OutOfProcess/HttpsTest.cs | 9 +- .../OutOfProcess/NtlmAuthentationTest.cs | 5 +- .../Properties/AssemblyInfo.cs | 2 + .../UpgradeFeatureDetectionTests.cs | 3 +- .../test/FunctionalTests/Utilities/Helpers.cs | 3 +- src/Servers/IIS/startvs.cmd | 3 + .../test/FunctionalTests/HelloWorldTest.cs | 2 +- .../ResponseCompressionTests.cs | 6 +- .../test/FunctionalTests/ResponseTests.cs | 8 +- startvs.cmd | 6 +- 569 files changed, 786 insertions(+), 1254 deletions(-) create mode 100644 eng/scripts/CodeCheck.ps1 create mode 100644 eng/scripts/common.psm1 rename src/Identity/{Identity => }/Core/src/AspNetRoleManager.cs (100%) rename src/Identity/{Identity => }/Core/src/AspNetUserManager.cs (100%) rename src/Identity/{Identity => }/Core/src/BuilderExtensions.cs (100%) rename src/Identity/{Identity => }/Core/src/DataProtectionTokenProvider.cs (100%) rename src/Identity/{Identity => }/Core/src/DataProtectionTokenProviderOptions.cs (100%) rename src/Identity/{Identity => }/Core/src/ExternalLoginInfo.cs (100%) rename src/Identity/{Identity => }/Core/src/ISecurityStampValidator.cs (100%) rename src/Identity/{Identity => }/Core/src/ITwoFactorSecurityStampValidator.cs (100%) rename src/Identity/{Identity => }/Core/src/IdentityBuilderExtensions.cs (100%) rename src/Identity/{Identity => }/Core/src/IdentityConstants.cs (100%) rename src/Identity/{Identity => }/Core/src/IdentityCookiesBuilder.cs (100%) rename src/Identity/{Identity => }/Core/src/IdentityCookiesBuilderExtensions.cs (100%) rename src/Identity/{Identity => }/Core/src/IdentityServiceCollectionExtensions.cs (100%) rename src/Identity/{Identity => }/Core/src/Microsoft.AspNetCore.Identity.csproj (100%) rename src/Identity/{Extensions => }/Core/src/Properties/AssemblyInfo.cs (100%) rename src/Identity/{Identity => }/Core/src/Properties/Resources.Designer.cs (100%) rename src/Identity/{Identity => }/Core/src/Properties/debugSettings.json (100%) rename src/Identity/{Identity => }/Core/src/Resources.resx (100%) rename src/Identity/{Identity => }/Core/src/SecurityStampRefreshingPrincipalContext.cs (100%) rename src/Identity/{Identity => }/Core/src/SecurityStampValidator.cs (100%) rename src/Identity/{Identity => }/Core/src/SecurityStampValidatorOptions.cs (100%) rename src/Identity/{Identity => }/Core/src/SignInManager.cs (100%) rename src/Identity/{Identity => }/Core/src/TwoFactorSecurityStampValidator.cs (100%) rename src/Identity/{Identity => }/Core/src/baseline.netcore.json (100%) rename src/Identity/{Identity => }/Core/src/baseline.netframework.json (100%) create mode 100644 src/Identity/Directory.Build.props rename src/Identity/{EF => EntityFrameworkCore}/src/IdentityDbContext.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/src/IdentityEntityFrameworkBuilderExtensions.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/src/IdentityUserContext.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj (100%) rename src/Identity/{EF => EntityFrameworkCore}/src/Properties/Resources.Designer.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/src/Resources.resx (100%) rename src/Identity/{EF => EntityFrameworkCore}/src/RoleStore.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/src/UserOnlyStore.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/src/UserStore.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/src/baseline.netcore.json (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.InMemory.Test/InMemoryContext.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj (90%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.InMemory.Test/RoleStoreTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.InMemory.Test/TestIdentityFactory.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/ApiConsistencyTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/CustomPocoTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/DbUtil.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/DefaultPocoTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/MaxKeyLengthSchemaTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj (79%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/SqlStoreOnlyUsersTestBase.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/SqlStoreTestBase.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/UserOnlyCustomContextTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/UserOnlyTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/UserStoreEncryptPersonalDataTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/UserStoreGuidKeyTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/UserStoreIntKeyTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/UserStoreStringKeyTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/UserStoreTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/UserStoreWithGenericsTest.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/Utilities/ScratchDatabaseFixture.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/Utilities/SqlServerTestStore.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/Utilities/TestEnvironment.cs (100%) rename src/Identity/{EF => EntityFrameworkCore}/test/EF.Test/config.json (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/AuthenticatorTokenProvider.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/Base32.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/ClaimsIdentityOptions.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/DefaultPersonalDataProtector.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/EmailTokenProvider.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/ILookupNormalizer.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/ILookupProtector.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/ILookupProtectorKeyRing.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IPasswordHasher.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IPasswordValidator.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IPersonalDataProtector.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IProtectedUserStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IQueryableRoleStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IQueryableUserStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IRoleClaimStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IRoleStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IRoleValidator.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserAuthenticationTokenStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserAuthenticatorKeyStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserClaimStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserClaimsPrincipalFactory.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserEmailStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserLockoutStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserLoginStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserPasswordStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserPhoneNumberStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserRoleStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserSecurityStampStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserTwoFactorRecoveryCodeStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserTwoFactorStore.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserTwoFactorTokenProvider.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IUserValidator.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IdentityBuilder.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IdentityError.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IdentityErrorDescriber.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IdentityOptions.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IdentityResult.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/IdentityServiceCollectionExtensions.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/LockoutOptions.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/Microsoft.Extensions.Identity.Core.csproj (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/PasswordHasher.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/PasswordHasherCompatibilityMode.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/PasswordHasherOptions.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/PasswordOptions.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/PasswordValidator.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/PasswordVerificationResult.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/PersonalDataAttribute.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/PhoneNumberTokenProvider.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/PrincipalExtensions.cs (100%) rename src/Identity/{Identity/Core => Extensions.Core}/src/Properties/AssemblyInfo.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/Properties/Resources.Designer.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/ProtectedPersonalDataAttribute.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/Resources.resx (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/Rfc6238AuthenticationService.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/RoleManager.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/RoleValidator.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/SignInOptions.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/SignInResult.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/StoreOptions.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/TokenOptions.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/TokenProviderDescriptor.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/TotpSecurityStampBasedTokenProvider.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/UpperInvariantLookupNormalizer.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/UserClaimsPrincipalFactory.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/UserLoginInfo.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/UserManager.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/UserOptions.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/UserValidator.cs (100%) rename src/Identity/{Extensions/Core => Extensions.Core}/src/baseline.netcore.json (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/IdentityRole.cs (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/IdentityRoleClaim.cs (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/IdentityUser.cs (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/IdentityUserClaim.cs (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/IdentityUserLogin.cs (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/IdentityUserRole.cs (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/IdentityUserToken.cs (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/Microsoft.Extensions.Identity.Stores.csproj (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/RoleStoreBase.cs (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/UserStoreBase.cs (100%) rename src/Identity/{Extensions/Stores => Extensions.Stores}/src/baseline.netcore.json (100%) delete mode 100644 src/Identity/IdentityCore.sln rename src/Identity/{Identity => }/README.md (100%) rename src/Identity/{Identity => }/Specification.Tests/src/IdentityResultAssert.cs (100%) rename src/Identity/{Identity => }/Specification.Tests/src/IdentitySpecificationTestBase.cs (100%) rename src/Identity/{Identity => }/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj (100%) rename src/Identity/{Identity => }/Specification.Tests/src/TestLogger.cs (100%) rename src/Identity/{Identity => }/Specification.Tests/src/UserManagerSpecificationTests.cs (100%) rename src/Identity/{Identity => }/Specification.Tests/src/baseline.netcore.json (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Filters/ExternalLoginsPageFilter.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Login.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Login.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Logout.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Logout.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/_Layout.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Register.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/Register.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Account/_ViewImports.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Error.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/Error.cshtml.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/_Layout.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/_ViewImports.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Pages/_ViewStart.cshtml (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Services/EmailSender.cs (100%) rename src/Identity/{Identity => }/UI/src/Areas/Identity/Services/IEmailSender.cs (100%) rename src/Identity/{Identity => }/UI/src/IdentityBuilderUIExtensions.cs (100%) rename src/Identity/{Identity => }/UI/src/IdentityDefaultUIAttribute.cs (100%) rename src/Identity/{Identity => }/UI/src/IdentityDefaultUIConfigureOptions.cs (100%) rename src/Identity/{Identity => }/UI/src/IdentityPageModelConvention.cs (100%) rename src/Identity/{Identity => }/UI/src/IdentityServiceCollectionUIExtensions.cs (100%) rename src/Identity/{Identity => }/UI/src/Microsoft.AspNetCore.Identity.UI.csproj (100%) rename src/Identity/{Identity => }/UI/src/THIRD-PARTY-NOTICES (100%) rename src/Identity/{Identity => }/UI/src/baseline.netcore.json (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/css/site.css (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/css/site.min.css (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/js/site.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/js/site.min.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/.bower.json (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/LICENSE (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/npm.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery-validation/.bower.json (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery-validation/LICENSE.md (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery/.bower.json (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery/LICENSE.txt (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.js (100%) rename src/Identity/{Identity => }/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.map (100%) create mode 100644 src/Identity/build.cmd rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewStart.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Controllers/HomeController.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Data/ApplicationDbContext.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Data/ApplicationUser.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Program.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Startup.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Views/Home/Index.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/Views/_ViewStart.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/appsettings.json (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/web.Debug.config (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/web.Release.config (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/web.config (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/wwwroot/css/site.css (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/wwwroot/css/site.min.css (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/wwwroot/favicon.ico (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/wwwroot/js/site.js (100%) rename src/Identity/{Identity => }/samples/IdentitySample.DefaultUI/wwwroot/js/site.min.js (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Controllers/AccountController.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Controllers/HomeController.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Controllers/ManageController.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/MessageServices.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/AccountViewModels/LoginViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/AccountViewModels/RegisterViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/AccountViewModels/ResetPasswordViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/AccountViewModels/UseRecoveryCodeViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyAuthenticatorCodeViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyCodeViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ApplicationUser.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ManageViewModels/AddPhoneNumberViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ManageViewModels/ChangePasswordViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ManageViewModels/DisplayRecoveryCodesViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ManageViewModels/FactorViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ManageViewModels/RemoveLoginViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ManageViewModels/SetPasswordViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Program.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Services/IEmailSender.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Services/ISmsSender.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Services/MessageServices.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Startup.cs (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/Lockout.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/Login.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/Register.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/ResetPasswordConfirmation.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Home/Index.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Manage/SetPassword.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/Views/_ViewStart.cshtml (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/appsettings.json (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/web.Debug.config (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/web.Release.config (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/web.config (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/wwwroot/css/site.css (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/wwwroot/favicon.ico (100%) rename src/Identity/{Identity => }/samples/IdentitySample.Mvc/wwwroot/js/site.js (100%) rename src/Identity/{Identity => }/samples/NativeWPFClient/App.config (100%) rename src/Identity/{Identity => }/samples/NativeWPFClient/App.xaml (100%) rename src/Identity/{Identity => }/samples/NativeWPFClient/App.xaml.cs (100%) rename src/Identity/{Identity => }/samples/NativeWPFClient/MainWindow.xaml (100%) rename src/Identity/{Identity => }/samples/NativeWPFClient/MainWindow.xaml.cs (100%) rename src/Identity/{Identity => }/samples/NativeWPFClient/NativeWPFClient.csproj (98%) rename src/Identity/{Identity => }/samples/NativeWPFClient/Properties/AssemblyInfo.cs (100%) rename src/Identity/{Identity => }/samples/NativeWPFClient/Properties/Resources.Designer.cs (100%) rename src/Identity/{Identity => }/samples/NativeWPFClient/Properties/Resources.resx (100%) rename src/Identity/{Identity => }/samples/NativeWPFClient/Properties/Settings.Designer.cs (100%) rename src/Identity/{Identity => }/samples/NativeWPFClient/Properties/Settings.settings (100%) create mode 100644 src/Identity/startvs.cmd rename src/Identity/{Identity => }/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserAuthorizationTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserLoginTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserManagementTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserRegistrationTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/AuthorizationTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Extensions/HtmlAssert.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Extensions/HttpClientExtensions.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Extensions/ResponseAssert.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserAuthorizationTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserLoginTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserManagementTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserRegistrationTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Infrastructure/DefaultUIPage.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Infrastructure/HtmlPage.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Infrastructure/HtmlPageContext.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/LoginTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/ManagementTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj (56%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/NoIdentityAddedTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/ConfirmEmail.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/ForgotPassword.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/ForgotPasswordConfirmation.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Login.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/LoginWith2fa.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/LoginWithRecoveryCode.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/ChangePassword.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/DeleteUser.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/EnableAuthenticator.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/LinkExternalLogin.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/ManageExternalLogin.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/PersonalData.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/RemoveExternalLogin.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/ResetAuthenticator.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/SetPassword.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/ShowRecoveryCodes.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Manage/TwoFactorAuthentication.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/Register.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/ResetPassword.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Account/ResetPasswordConfirmation.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Contoso/Login.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/Pages/Index.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/PocoUserTests/PocoUserAuthorizationTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/PocoUserTests/PocoUserLoginTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/PocoUserTests/PocoUserManagementTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/PocoUserTests/PocoUserRegistrationTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/RegistrationTests.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/UserStories.cs (100%) rename src/Identity/{Identity => }/test/Identity.FunctionalTests/xunit.runner.json (100%) rename src/Identity/{Identity => }/test/Identity.Test/ApiConsistencyTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/CdnScriptTaghelperTests.cs (97%) rename src/Identity/{Identity => }/test/Identity.Test/IdentityBuilderTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/IdentityOptionsTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/IdentityResultTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj (90%) rename src/Identity/{Identity => }/test/Identity.Test/NoopRoleStore.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/NoopUserStore.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/PasswordHasherTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/PasswordValidatorTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/PrincipalExtensionsTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/RoleManagerTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/RoleValidatorTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/SecurityStampValidatorTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/SignInManagerTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/UserManagerTest.cs (100%) rename src/Identity/{Identity => }/test/Identity.Test/UserValidatorTest.cs (100%) rename src/Identity/{Identity => }/test/InMemory.Test/ControllerTest.cs (100%) rename src/Identity/{Identity => }/test/InMemory.Test/FunctionalTest.cs (100%) rename src/Identity/{Identity => }/test/InMemory.Test/InMemoryStore.cs (100%) rename src/Identity/{Identity => }/test/InMemory.Test/InMemoryStoreTest.cs (100%) rename src/Identity/{Identity => }/test/InMemory.Test/InMemoryUserStore.cs (100%) rename src/Identity/{Identity => }/test/InMemory.Test/InMemoryUserStoreTest.cs (100%) rename src/Identity/{Identity => }/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj (88%) rename src/Identity/{Identity => }/test/InMemory.Test/TestClock.cs (100%) rename src/Identity/{ => test}/Shared/ApiConsistencyTestBase.cs (100%) rename src/Identity/{ => test}/Shared/MockHelpers.cs (100%) rename src/Identity/{Shared => test/Shared/PocoModel}/PocoRole.cs (100%) rename src/Identity/{Shared => test/Shared/PocoModel}/PocoRoleClaim.cs (100%) rename src/Identity/{Shared => test/Shared/PocoModel}/PocoUser.cs (100%) rename src/Identity/{Shared => test/Shared/PocoModel}/PocoUserClaim.cs (100%) rename src/Identity/{Shared => test/Shared/PocoModel}/PocoUserLogin.cs (100%) rename src/Identity/{Shared => test/Shared/PocoModel}/PocoUserRole.cs (100%) rename src/Identity/{Shared => test/Shared/PocoModel}/PocoUserToken.cs (100%) rename src/Identity/{ => test}/Shared/PriorityOrderer.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj (94%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/NoIdentityStartup.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/_CookieConsentPartial.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/PocoUser.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/PocoUserStartup.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Program.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/Startup.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/StartupBase.cs (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/appsettings.Development.json (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/appsettings.json (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/bundleconfig.json (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.css (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.min.css (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/favicon.ico (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner1.svg (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner2.svg (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner3.svg (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner4.svg (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.js (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.min.js (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/.bower.json (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/.bower.json (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/.bower.json (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/.bower.json (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js (100%) rename src/Identity/{Identity => }/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map (100%) create mode 100644 src/Servers/IIS/startvs.cmd diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 7126baae5c..99ce2823b0 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -16,3 +16,13 @@ jobs: beforeBuild: - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1" displayName: Setup IISExpress test certificates +- template: jobs/default-build.yml + parameters: + jobName: macOs_Build + jobDisplayName: "Build and test : macOS" + agentOs: macOS +- template: jobs/default-build.yml + parameters: + jobName: Linux_Build + jobDisplayName: "Build and test : Linux" + agentOs: Linux diff --git a/.azure/pipelines/pr-validation-temp.yml b/.azure/pipelines/pr-validation-temp.yml index b190d7c0c4..a45b973a68 100644 --- a/.azure/pipelines/pr-validation-temp.yml +++ b/.azure/pipelines/pr-validation-temp.yml @@ -28,3 +28,11 @@ jobs: jobDisplayName: "Build only : Linux" agentOs: Linux buildArgs: '/p:SkipTests=true' +- job: Code_check + displayName: Code check + workspace: + clean: all + pool: + vmImage: vs2017-win2016 + steps: + - powershell: ./eng/scripts/CodeCheck.ps1 -ci diff --git a/Directory.Build.props b/Directory.Build.props index 8d176f3b4d..2387a78ed5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -38,6 +38,8 @@ netcoreapp2.1;net461 + + $(MSBuildThisFileDirectory)src\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.targets diff --git a/build/repo.props b/build/repo.props index 96da90068f..460315713e 100644 --- a/build/repo.props +++ b/build/repo.props @@ -63,13 +63,10 @@ - - - - - - - - - - + + + + + + diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 new file mode 100644 index 0000000000..08e1902cbb --- /dev/null +++ b/eng/scripts/CodeCheck.ps1 @@ -0,0 +1,69 @@ +#requires -version 5 +<# +.SYNOPSIS +This script runs a quick check for common errors, such as checking that Visual Studio solutions are up to date or that generated code has been committed to source. +#> +param( + [switch]$ci +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 1 +Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" + +$repoRoot = Resolve-Path "$PSScriptRoot/../../" + +[string[]] $errors = @() + +try { + # + # Solutions + # + + Write-Host "Checking that solutions are up to date" + + Get-ChildItem "$repoRoot/*.sln" -Recurse | % { + Write-Host " Checking $(Split-Path -Leaf $_)" + $slnDir = Split-Path -Parent $_ + $sln = $_ + & dotnet sln $_ list ` + | ? { $_ -ne 'Project(s)' -and $_ -ne '----------' } ` + | % { + $proj = Join-Path $slnDir $_ + if (-not (Test-Path $proj)) { + $errors += "Missing project. Solution references a project which does not exist: $proj. [$sln] " + } + } + } + + # + # Generated code check + # + + Write-Host "Re-running code generation" + + Invoke-Block { + [string[]] $generateArgs = @() + if ($ci) { + $generateArgs += '-ci' + } + & $repoRoot/build.cmd /t:GenerateProjectList @generateArgs + } + + Write-Host "git diff" + & git diff --ignore-space-at-eol --exit-code + if ($LastExitCode -ne 0) { + $status = git status -s | Out-String + $status = $status -replace "`n","`n " + $errors += "Generated code is not up to date." + } +} +finally { + foreach ($err in $errors) { + Write-Host -f Red "error : $err" + } + + if ($errors) { + exit 1 + } +} diff --git a/eng/scripts/common.psm1 b/eng/scripts/common.psm1 new file mode 100644 index 0000000000..96544dc6f2 --- /dev/null +++ b/eng/scripts/common.psm1 @@ -0,0 +1,74 @@ +$ErrorActionPreference = 'Stop' +# Update the default TLS support to 1.2 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +function Invoke-Block([scriptblock]$cmd, [string]$WorkingDir = $null) { + if ($WorkingDir) { + Push-Location $WorkingDir + } + + try { + + $cmd | Out-String | Write-Verbose + & $cmd + + # Need to check both of these cases for errors as they represent different items + # - $?: did the powershell script block throw an error + # - $lastexitcode: did a windows command executed by the script block end in error + if ((-not $?) -or ($lastexitcode -ne 0)) { + if ($error -ne $null) + { + Write-Warning $error[0] + } + throw "Command failed to execute: $cmd" + } + } + finally { + if ($WorkingDir) { + Pop-Location + } + } +} + +function SaveXml([xml]$xml, [string]$path) { + Write-Verbose "Saving to $path" + $ErrorActionPreference = 'stop' + + $settings = New-Object System.XML.XmlWriterSettings + $settings.OmitXmlDeclaration = $true + $settings.Encoding = New-Object System.Text.UTF8Encoding( $true ) + $writer = [System.XML.XMLTextWriter]::Create($path, $settings) + $xml.Save($writer) + $writer.Close() +} + +function LoadXml([string]$path) { + Write-Verbose "Reading from $path" + + $ErrorActionPreference = 'stop' + $obj = new-object xml + $obj.PreserveWhitespace = $true + $obj.Load($path) + return $obj +} + +function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) { + if ($RemotePath -notlike 'http*') { + Copy-Item $RemotePath $LocalPath + return + } + + $retries = 10 + while ($retries -gt 0) { + $retries -= 1 + try { + Invoke-WebRequest -UseBasicParsing -Uri $RemotePath -OutFile $LocalPath + return + } + catch { + Write-Verbose "Request failed. $retries retries remaining" + } + } + + Write-Error "Download failed: '$RemotePath'." +} diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 03d1a19d19..be0d5421ec 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15850 -commithash:725f1523b274d40570f4c923c4712a01f2ef3387 +version:2.1.7-build-20181213.1 +commithash:69f12b27418b4925734d427b2c3e36c53f265c12 diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln index 224a27d2cc..52aeadf5e3 100644 --- a/src/Azure/Azure.sln +++ b/src/Azure/Azure.sln @@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Static EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9631D314-7B0C-4CEC-8650-0259A8F4C77A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9631D314-7B0C-4CEC-8650-0259A8F4C77A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}" EndProject diff --git a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj index 059d4a8e12..9f3424fc41 100644 --- a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj +++ b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj @@ -17,6 +17,5 @@ - - + diff --git a/src/Identity/Identity/Core/src/AspNetRoleManager.cs b/src/Identity/Core/src/AspNetRoleManager.cs similarity index 100% rename from src/Identity/Identity/Core/src/AspNetRoleManager.cs rename to src/Identity/Core/src/AspNetRoleManager.cs diff --git a/src/Identity/Identity/Core/src/AspNetUserManager.cs b/src/Identity/Core/src/AspNetUserManager.cs similarity index 100% rename from src/Identity/Identity/Core/src/AspNetUserManager.cs rename to src/Identity/Core/src/AspNetUserManager.cs diff --git a/src/Identity/Identity/Core/src/BuilderExtensions.cs b/src/Identity/Core/src/BuilderExtensions.cs similarity index 100% rename from src/Identity/Identity/Core/src/BuilderExtensions.cs rename to src/Identity/Core/src/BuilderExtensions.cs diff --git a/src/Identity/Identity/Core/src/DataProtectionTokenProvider.cs b/src/Identity/Core/src/DataProtectionTokenProvider.cs similarity index 100% rename from src/Identity/Identity/Core/src/DataProtectionTokenProvider.cs rename to src/Identity/Core/src/DataProtectionTokenProvider.cs diff --git a/src/Identity/Identity/Core/src/DataProtectionTokenProviderOptions.cs b/src/Identity/Core/src/DataProtectionTokenProviderOptions.cs similarity index 100% rename from src/Identity/Identity/Core/src/DataProtectionTokenProviderOptions.cs rename to src/Identity/Core/src/DataProtectionTokenProviderOptions.cs diff --git a/src/Identity/Identity/Core/src/ExternalLoginInfo.cs b/src/Identity/Core/src/ExternalLoginInfo.cs similarity index 100% rename from src/Identity/Identity/Core/src/ExternalLoginInfo.cs rename to src/Identity/Core/src/ExternalLoginInfo.cs diff --git a/src/Identity/Identity/Core/src/ISecurityStampValidator.cs b/src/Identity/Core/src/ISecurityStampValidator.cs similarity index 100% rename from src/Identity/Identity/Core/src/ISecurityStampValidator.cs rename to src/Identity/Core/src/ISecurityStampValidator.cs diff --git a/src/Identity/Identity/Core/src/ITwoFactorSecurityStampValidator.cs b/src/Identity/Core/src/ITwoFactorSecurityStampValidator.cs similarity index 100% rename from src/Identity/Identity/Core/src/ITwoFactorSecurityStampValidator.cs rename to src/Identity/Core/src/ITwoFactorSecurityStampValidator.cs diff --git a/src/Identity/Identity/Core/src/IdentityBuilderExtensions.cs b/src/Identity/Core/src/IdentityBuilderExtensions.cs similarity index 100% rename from src/Identity/Identity/Core/src/IdentityBuilderExtensions.cs rename to src/Identity/Core/src/IdentityBuilderExtensions.cs diff --git a/src/Identity/Identity/Core/src/IdentityConstants.cs b/src/Identity/Core/src/IdentityConstants.cs similarity index 100% rename from src/Identity/Identity/Core/src/IdentityConstants.cs rename to src/Identity/Core/src/IdentityConstants.cs diff --git a/src/Identity/Identity/Core/src/IdentityCookiesBuilder.cs b/src/Identity/Core/src/IdentityCookiesBuilder.cs similarity index 100% rename from src/Identity/Identity/Core/src/IdentityCookiesBuilder.cs rename to src/Identity/Core/src/IdentityCookiesBuilder.cs diff --git a/src/Identity/Identity/Core/src/IdentityCookiesBuilderExtensions.cs b/src/Identity/Core/src/IdentityCookiesBuilderExtensions.cs similarity index 100% rename from src/Identity/Identity/Core/src/IdentityCookiesBuilderExtensions.cs rename to src/Identity/Core/src/IdentityCookiesBuilderExtensions.cs diff --git a/src/Identity/Identity/Core/src/IdentityServiceCollectionExtensions.cs b/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs similarity index 100% rename from src/Identity/Identity/Core/src/IdentityServiceCollectionExtensions.cs rename to src/Identity/Core/src/IdentityServiceCollectionExtensions.cs diff --git a/src/Identity/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj similarity index 100% rename from src/Identity/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj rename to src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj diff --git a/src/Identity/Extensions/Core/src/Properties/AssemblyInfo.cs b/src/Identity/Core/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Identity/Extensions/Core/src/Properties/AssemblyInfo.cs rename to src/Identity/Core/src/Properties/AssemblyInfo.cs diff --git a/src/Identity/Identity/Core/src/Properties/Resources.Designer.cs b/src/Identity/Core/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Identity/Identity/Core/src/Properties/Resources.Designer.cs rename to src/Identity/Core/src/Properties/Resources.Designer.cs diff --git a/src/Identity/Identity/Core/src/Properties/debugSettings.json b/src/Identity/Core/src/Properties/debugSettings.json similarity index 100% rename from src/Identity/Identity/Core/src/Properties/debugSettings.json rename to src/Identity/Core/src/Properties/debugSettings.json diff --git a/src/Identity/Identity/Core/src/Resources.resx b/src/Identity/Core/src/Resources.resx similarity index 100% rename from src/Identity/Identity/Core/src/Resources.resx rename to src/Identity/Core/src/Resources.resx diff --git a/src/Identity/Identity/Core/src/SecurityStampRefreshingPrincipalContext.cs b/src/Identity/Core/src/SecurityStampRefreshingPrincipalContext.cs similarity index 100% rename from src/Identity/Identity/Core/src/SecurityStampRefreshingPrincipalContext.cs rename to src/Identity/Core/src/SecurityStampRefreshingPrincipalContext.cs diff --git a/src/Identity/Identity/Core/src/SecurityStampValidator.cs b/src/Identity/Core/src/SecurityStampValidator.cs similarity index 100% rename from src/Identity/Identity/Core/src/SecurityStampValidator.cs rename to src/Identity/Core/src/SecurityStampValidator.cs diff --git a/src/Identity/Identity/Core/src/SecurityStampValidatorOptions.cs b/src/Identity/Core/src/SecurityStampValidatorOptions.cs similarity index 100% rename from src/Identity/Identity/Core/src/SecurityStampValidatorOptions.cs rename to src/Identity/Core/src/SecurityStampValidatorOptions.cs diff --git a/src/Identity/Identity/Core/src/SignInManager.cs b/src/Identity/Core/src/SignInManager.cs similarity index 100% rename from src/Identity/Identity/Core/src/SignInManager.cs rename to src/Identity/Core/src/SignInManager.cs diff --git a/src/Identity/Identity/Core/src/TwoFactorSecurityStampValidator.cs b/src/Identity/Core/src/TwoFactorSecurityStampValidator.cs similarity index 100% rename from src/Identity/Identity/Core/src/TwoFactorSecurityStampValidator.cs rename to src/Identity/Core/src/TwoFactorSecurityStampValidator.cs diff --git a/src/Identity/Identity/Core/src/baseline.netcore.json b/src/Identity/Core/src/baseline.netcore.json similarity index 100% rename from src/Identity/Identity/Core/src/baseline.netcore.json rename to src/Identity/Core/src/baseline.netcore.json diff --git a/src/Identity/Identity/Core/src/baseline.netframework.json b/src/Identity/Core/src/baseline.netframework.json similarity index 100% rename from src/Identity/Identity/Core/src/baseline.netframework.json rename to src/Identity/Core/src/baseline.netframework.json diff --git a/src/Identity/Directory.Build.props b/src/Identity/Directory.Build.props new file mode 100644 index 0000000000..7a3a58cbc2 --- /dev/null +++ b/src/Identity/Directory.Build.props @@ -0,0 +1,8 @@ + + + + + $(MSBuildThisFileDirectory)test\Shared\ + + + diff --git a/src/Identity/EF/src/IdentityDbContext.cs b/src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs similarity index 100% rename from src/Identity/EF/src/IdentityDbContext.cs rename to src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs diff --git a/src/Identity/EF/src/IdentityEntityFrameworkBuilderExtensions.cs b/src/Identity/EntityFrameworkCore/src/IdentityEntityFrameworkBuilderExtensions.cs similarity index 100% rename from src/Identity/EF/src/IdentityEntityFrameworkBuilderExtensions.cs rename to src/Identity/EntityFrameworkCore/src/IdentityEntityFrameworkBuilderExtensions.cs diff --git a/src/Identity/EF/src/IdentityUserContext.cs b/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs similarity index 100% rename from src/Identity/EF/src/IdentityUserContext.cs rename to src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs diff --git a/src/Identity/EF/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj similarity index 100% rename from src/Identity/EF/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj rename to src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj diff --git a/src/Identity/EF/src/Properties/Resources.Designer.cs b/src/Identity/EntityFrameworkCore/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Identity/EF/src/Properties/Resources.Designer.cs rename to src/Identity/EntityFrameworkCore/src/Properties/Resources.Designer.cs diff --git a/src/Identity/EF/src/Resources.resx b/src/Identity/EntityFrameworkCore/src/Resources.resx similarity index 100% rename from src/Identity/EF/src/Resources.resx rename to src/Identity/EntityFrameworkCore/src/Resources.resx diff --git a/src/Identity/EF/src/RoleStore.cs b/src/Identity/EntityFrameworkCore/src/RoleStore.cs similarity index 100% rename from src/Identity/EF/src/RoleStore.cs rename to src/Identity/EntityFrameworkCore/src/RoleStore.cs diff --git a/src/Identity/EF/src/UserOnlyStore.cs b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs similarity index 100% rename from src/Identity/EF/src/UserOnlyStore.cs rename to src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs diff --git a/src/Identity/EF/src/UserStore.cs b/src/Identity/EntityFrameworkCore/src/UserStore.cs similarity index 100% rename from src/Identity/EF/src/UserStore.cs rename to src/Identity/EntityFrameworkCore/src/UserStore.cs diff --git a/src/Identity/EF/src/baseline.netcore.json b/src/Identity/EntityFrameworkCore/src/baseline.netcore.json similarity index 100% rename from src/Identity/EF/src/baseline.netcore.json rename to src/Identity/EntityFrameworkCore/src/baseline.netcore.json diff --git a/src/Identity/EF/test/EF.InMemory.Test/InMemoryContext.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs similarity index 100% rename from src/Identity/EF/test/EF.InMemory.Test/InMemoryContext.cs rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs diff --git a/src/Identity/EF/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs similarity index 100% rename from src/Identity/EF/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs diff --git a/src/Identity/EF/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs similarity index 100% rename from src/Identity/EF/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs diff --git a/src/Identity/EF/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs similarity index 100% rename from src/Identity/EF/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs diff --git a/src/Identity/EF/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj similarity index 90% rename from src/Identity/EF/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj index 29d390e994..e5f58004d1 100644 --- a/src/Identity/EF/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Identity/EF/test/EF.InMemory.Test/RoleStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/RoleStoreTest.cs similarity index 100% rename from src/Identity/EF/test/EF.InMemory.Test/RoleStoreTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/RoleStoreTest.cs diff --git a/src/Identity/EF/test/EF.InMemory.Test/TestIdentityFactory.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/TestIdentityFactory.cs similarity index 100% rename from src/Identity/EF/test/EF.InMemory.Test/TestIdentityFactory.cs rename to src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/TestIdentityFactory.cs diff --git a/src/Identity/EF/test/EF.Test/ApiConsistencyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/ApiConsistencyTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/ApiConsistencyTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/ApiConsistencyTest.cs diff --git a/src/Identity/EF/test/EF.Test/CustomPocoTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/CustomPocoTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs diff --git a/src/Identity/EF/test/EF.Test/DbUtil.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/DbUtil.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs diff --git a/src/Identity/EF/test/EF.Test/DefaultPocoTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/DefaultPocoTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs diff --git a/src/Identity/EF/test/EF.Test/MaxKeyLengthSchemaTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/MaxKeyLengthSchemaTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs diff --git a/src/Identity/EF/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj similarity index 79% rename from src/Identity/EF/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj rename to src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj index 360cd34ba2..fda44a6142 100644 --- a/src/Identity/EF/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj @@ -2,10 +2,13 @@ $(StandardTestTfms) + + + true - + diff --git a/src/Identity/EF/test/EF.Test/SqlStoreOnlyUsersTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/SqlStoreOnlyUsersTestBase.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs diff --git a/src/Identity/EF/test/EF.Test/SqlStoreTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/SqlStoreTestBase.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs diff --git a/src/Identity/EF/test/EF.Test/UserOnlyCustomContextTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/UserOnlyCustomContextTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs diff --git a/src/Identity/EF/test/EF.Test/UserOnlyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/UserOnlyTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs diff --git a/src/Identity/EF/test/EF.Test/UserStoreEncryptPersonalDataTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/UserStoreEncryptPersonalDataTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs diff --git a/src/Identity/EF/test/EF.Test/UserStoreGuidKeyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreGuidKeyTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/UserStoreGuidKeyTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreGuidKeyTest.cs diff --git a/src/Identity/EF/test/EF.Test/UserStoreIntKeyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreIntKeyTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/UserStoreIntKeyTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreIntKeyTest.cs diff --git a/src/Identity/EF/test/EF.Test/UserStoreStringKeyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreStringKeyTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/UserStoreStringKeyTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreStringKeyTest.cs diff --git a/src/Identity/EF/test/EF.Test/UserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/UserStoreTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs diff --git a/src/Identity/EF/test/EF.Test/UserStoreWithGenericsTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/UserStoreWithGenericsTest.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs diff --git a/src/Identity/EF/test/EF.Test/Utilities/ScratchDatabaseFixture.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/Utilities/ScratchDatabaseFixture.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs diff --git a/src/Identity/EF/test/EF.Test/Utilities/SqlServerTestStore.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/SqlServerTestStore.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/Utilities/SqlServerTestStore.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/SqlServerTestStore.cs diff --git a/src/Identity/EF/test/EF.Test/Utilities/TestEnvironment.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/TestEnvironment.cs similarity index 100% rename from src/Identity/EF/test/EF.Test/Utilities/TestEnvironment.cs rename to src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/TestEnvironment.cs diff --git a/src/Identity/EF/test/EF.Test/config.json b/src/Identity/EntityFrameworkCore/test/EF.Test/config.json similarity index 100% rename from src/Identity/EF/test/EF.Test/config.json rename to src/Identity/EntityFrameworkCore/test/EF.Test/config.json diff --git a/src/Identity/Extensions/Core/src/AuthenticatorTokenProvider.cs b/src/Identity/Extensions.Core/src/AuthenticatorTokenProvider.cs similarity index 100% rename from src/Identity/Extensions/Core/src/AuthenticatorTokenProvider.cs rename to src/Identity/Extensions.Core/src/AuthenticatorTokenProvider.cs diff --git a/src/Identity/Extensions/Core/src/Base32.cs b/src/Identity/Extensions.Core/src/Base32.cs similarity index 100% rename from src/Identity/Extensions/Core/src/Base32.cs rename to src/Identity/Extensions.Core/src/Base32.cs diff --git a/src/Identity/Extensions/Core/src/ClaimsIdentityOptions.cs b/src/Identity/Extensions.Core/src/ClaimsIdentityOptions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/ClaimsIdentityOptions.cs rename to src/Identity/Extensions.Core/src/ClaimsIdentityOptions.cs diff --git a/src/Identity/Extensions/Core/src/DefaultPersonalDataProtector.cs b/src/Identity/Extensions.Core/src/DefaultPersonalDataProtector.cs similarity index 100% rename from src/Identity/Extensions/Core/src/DefaultPersonalDataProtector.cs rename to src/Identity/Extensions.Core/src/DefaultPersonalDataProtector.cs diff --git a/src/Identity/Extensions/Core/src/EmailTokenProvider.cs b/src/Identity/Extensions.Core/src/EmailTokenProvider.cs similarity index 100% rename from src/Identity/Extensions/Core/src/EmailTokenProvider.cs rename to src/Identity/Extensions.Core/src/EmailTokenProvider.cs diff --git a/src/Identity/Extensions/Core/src/ILookupNormalizer.cs b/src/Identity/Extensions.Core/src/ILookupNormalizer.cs similarity index 100% rename from src/Identity/Extensions/Core/src/ILookupNormalizer.cs rename to src/Identity/Extensions.Core/src/ILookupNormalizer.cs diff --git a/src/Identity/Extensions/Core/src/ILookupProtector.cs b/src/Identity/Extensions.Core/src/ILookupProtector.cs similarity index 100% rename from src/Identity/Extensions/Core/src/ILookupProtector.cs rename to src/Identity/Extensions.Core/src/ILookupProtector.cs diff --git a/src/Identity/Extensions/Core/src/ILookupProtectorKeyRing.cs b/src/Identity/Extensions.Core/src/ILookupProtectorKeyRing.cs similarity index 100% rename from src/Identity/Extensions/Core/src/ILookupProtectorKeyRing.cs rename to src/Identity/Extensions.Core/src/ILookupProtectorKeyRing.cs diff --git a/src/Identity/Extensions/Core/src/IPasswordHasher.cs b/src/Identity/Extensions.Core/src/IPasswordHasher.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IPasswordHasher.cs rename to src/Identity/Extensions.Core/src/IPasswordHasher.cs diff --git a/src/Identity/Extensions/Core/src/IPasswordValidator.cs b/src/Identity/Extensions.Core/src/IPasswordValidator.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IPasswordValidator.cs rename to src/Identity/Extensions.Core/src/IPasswordValidator.cs diff --git a/src/Identity/Extensions/Core/src/IPersonalDataProtector.cs b/src/Identity/Extensions.Core/src/IPersonalDataProtector.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IPersonalDataProtector.cs rename to src/Identity/Extensions.Core/src/IPersonalDataProtector.cs diff --git a/src/Identity/Extensions/Core/src/IProtectedUserStore.cs b/src/Identity/Extensions.Core/src/IProtectedUserStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IProtectedUserStore.cs rename to src/Identity/Extensions.Core/src/IProtectedUserStore.cs diff --git a/src/Identity/Extensions/Core/src/IQueryableRoleStore.cs b/src/Identity/Extensions.Core/src/IQueryableRoleStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IQueryableRoleStore.cs rename to src/Identity/Extensions.Core/src/IQueryableRoleStore.cs diff --git a/src/Identity/Extensions/Core/src/IQueryableUserStore.cs b/src/Identity/Extensions.Core/src/IQueryableUserStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IQueryableUserStore.cs rename to src/Identity/Extensions.Core/src/IQueryableUserStore.cs diff --git a/src/Identity/Extensions/Core/src/IRoleClaimStore.cs b/src/Identity/Extensions.Core/src/IRoleClaimStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IRoleClaimStore.cs rename to src/Identity/Extensions.Core/src/IRoleClaimStore.cs diff --git a/src/Identity/Extensions/Core/src/IRoleStore.cs b/src/Identity/Extensions.Core/src/IRoleStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IRoleStore.cs rename to src/Identity/Extensions.Core/src/IRoleStore.cs diff --git a/src/Identity/Extensions/Core/src/IRoleValidator.cs b/src/Identity/Extensions.Core/src/IRoleValidator.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IRoleValidator.cs rename to src/Identity/Extensions.Core/src/IRoleValidator.cs diff --git a/src/Identity/Extensions/Core/src/IUserAuthenticationTokenStore.cs b/src/Identity/Extensions.Core/src/IUserAuthenticationTokenStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserAuthenticationTokenStore.cs rename to src/Identity/Extensions.Core/src/IUserAuthenticationTokenStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserAuthenticatorKeyStore.cs b/src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserAuthenticatorKeyStore.cs rename to src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserClaimStore.cs b/src/Identity/Extensions.Core/src/IUserClaimStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserClaimStore.cs rename to src/Identity/Extensions.Core/src/IUserClaimStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserClaimsPrincipalFactory.cs b/src/Identity/Extensions.Core/src/IUserClaimsPrincipalFactory.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserClaimsPrincipalFactory.cs rename to src/Identity/Extensions.Core/src/IUserClaimsPrincipalFactory.cs diff --git a/src/Identity/Extensions/Core/src/IUserEmailStore.cs b/src/Identity/Extensions.Core/src/IUserEmailStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserEmailStore.cs rename to src/Identity/Extensions.Core/src/IUserEmailStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserLockoutStore.cs b/src/Identity/Extensions.Core/src/IUserLockoutStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserLockoutStore.cs rename to src/Identity/Extensions.Core/src/IUserLockoutStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserLoginStore.cs b/src/Identity/Extensions.Core/src/IUserLoginStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserLoginStore.cs rename to src/Identity/Extensions.Core/src/IUserLoginStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserPasswordStore.cs b/src/Identity/Extensions.Core/src/IUserPasswordStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserPasswordStore.cs rename to src/Identity/Extensions.Core/src/IUserPasswordStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserPhoneNumberStore.cs b/src/Identity/Extensions.Core/src/IUserPhoneNumberStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserPhoneNumberStore.cs rename to src/Identity/Extensions.Core/src/IUserPhoneNumberStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserRoleStore.cs b/src/Identity/Extensions.Core/src/IUserRoleStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserRoleStore.cs rename to src/Identity/Extensions.Core/src/IUserRoleStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserSecurityStampStore.cs b/src/Identity/Extensions.Core/src/IUserSecurityStampStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserSecurityStampStore.cs rename to src/Identity/Extensions.Core/src/IUserSecurityStampStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserStore.cs b/src/Identity/Extensions.Core/src/IUserStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserStore.cs rename to src/Identity/Extensions.Core/src/IUserStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserTwoFactorRecoveryCodeStore.cs b/src/Identity/Extensions.Core/src/IUserTwoFactorRecoveryCodeStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserTwoFactorRecoveryCodeStore.cs rename to src/Identity/Extensions.Core/src/IUserTwoFactorRecoveryCodeStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserTwoFactorStore.cs b/src/Identity/Extensions.Core/src/IUserTwoFactorStore.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserTwoFactorStore.cs rename to src/Identity/Extensions.Core/src/IUserTwoFactorStore.cs diff --git a/src/Identity/Extensions/Core/src/IUserTwoFactorTokenProvider.cs b/src/Identity/Extensions.Core/src/IUserTwoFactorTokenProvider.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserTwoFactorTokenProvider.cs rename to src/Identity/Extensions.Core/src/IUserTwoFactorTokenProvider.cs diff --git a/src/Identity/Extensions/Core/src/IUserValidator.cs b/src/Identity/Extensions.Core/src/IUserValidator.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IUserValidator.cs rename to src/Identity/Extensions.Core/src/IUserValidator.cs diff --git a/src/Identity/Extensions/Core/src/IdentityBuilder.cs b/src/Identity/Extensions.Core/src/IdentityBuilder.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IdentityBuilder.cs rename to src/Identity/Extensions.Core/src/IdentityBuilder.cs diff --git a/src/Identity/Extensions/Core/src/IdentityError.cs b/src/Identity/Extensions.Core/src/IdentityError.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IdentityError.cs rename to src/Identity/Extensions.Core/src/IdentityError.cs diff --git a/src/Identity/Extensions/Core/src/IdentityErrorDescriber.cs b/src/Identity/Extensions.Core/src/IdentityErrorDescriber.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IdentityErrorDescriber.cs rename to src/Identity/Extensions.Core/src/IdentityErrorDescriber.cs diff --git a/src/Identity/Extensions/Core/src/IdentityOptions.cs b/src/Identity/Extensions.Core/src/IdentityOptions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IdentityOptions.cs rename to src/Identity/Extensions.Core/src/IdentityOptions.cs diff --git a/src/Identity/Extensions/Core/src/IdentityResult.cs b/src/Identity/Extensions.Core/src/IdentityResult.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IdentityResult.cs rename to src/Identity/Extensions.Core/src/IdentityResult.cs diff --git a/src/Identity/Extensions/Core/src/IdentityServiceCollectionExtensions.cs b/src/Identity/Extensions.Core/src/IdentityServiceCollectionExtensions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/IdentityServiceCollectionExtensions.cs rename to src/Identity/Extensions.Core/src/IdentityServiceCollectionExtensions.cs diff --git a/src/Identity/Extensions/Core/src/LockoutOptions.cs b/src/Identity/Extensions.Core/src/LockoutOptions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/LockoutOptions.cs rename to src/Identity/Extensions.Core/src/LockoutOptions.cs diff --git a/src/Identity/Extensions/Core/src/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj similarity index 100% rename from src/Identity/Extensions/Core/src/Microsoft.Extensions.Identity.Core.csproj rename to src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj diff --git a/src/Identity/Extensions/Core/src/PasswordHasher.cs b/src/Identity/Extensions.Core/src/PasswordHasher.cs similarity index 100% rename from src/Identity/Extensions/Core/src/PasswordHasher.cs rename to src/Identity/Extensions.Core/src/PasswordHasher.cs diff --git a/src/Identity/Extensions/Core/src/PasswordHasherCompatibilityMode.cs b/src/Identity/Extensions.Core/src/PasswordHasherCompatibilityMode.cs similarity index 100% rename from src/Identity/Extensions/Core/src/PasswordHasherCompatibilityMode.cs rename to src/Identity/Extensions.Core/src/PasswordHasherCompatibilityMode.cs diff --git a/src/Identity/Extensions/Core/src/PasswordHasherOptions.cs b/src/Identity/Extensions.Core/src/PasswordHasherOptions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/PasswordHasherOptions.cs rename to src/Identity/Extensions.Core/src/PasswordHasherOptions.cs diff --git a/src/Identity/Extensions/Core/src/PasswordOptions.cs b/src/Identity/Extensions.Core/src/PasswordOptions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/PasswordOptions.cs rename to src/Identity/Extensions.Core/src/PasswordOptions.cs diff --git a/src/Identity/Extensions/Core/src/PasswordValidator.cs b/src/Identity/Extensions.Core/src/PasswordValidator.cs similarity index 100% rename from src/Identity/Extensions/Core/src/PasswordValidator.cs rename to src/Identity/Extensions.Core/src/PasswordValidator.cs diff --git a/src/Identity/Extensions/Core/src/PasswordVerificationResult.cs b/src/Identity/Extensions.Core/src/PasswordVerificationResult.cs similarity index 100% rename from src/Identity/Extensions/Core/src/PasswordVerificationResult.cs rename to src/Identity/Extensions.Core/src/PasswordVerificationResult.cs diff --git a/src/Identity/Extensions/Core/src/PersonalDataAttribute.cs b/src/Identity/Extensions.Core/src/PersonalDataAttribute.cs similarity index 100% rename from src/Identity/Extensions/Core/src/PersonalDataAttribute.cs rename to src/Identity/Extensions.Core/src/PersonalDataAttribute.cs diff --git a/src/Identity/Extensions/Core/src/PhoneNumberTokenProvider.cs b/src/Identity/Extensions.Core/src/PhoneNumberTokenProvider.cs similarity index 100% rename from src/Identity/Extensions/Core/src/PhoneNumberTokenProvider.cs rename to src/Identity/Extensions.Core/src/PhoneNumberTokenProvider.cs diff --git a/src/Identity/Extensions/Core/src/PrincipalExtensions.cs b/src/Identity/Extensions.Core/src/PrincipalExtensions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/PrincipalExtensions.cs rename to src/Identity/Extensions.Core/src/PrincipalExtensions.cs diff --git a/src/Identity/Identity/Core/src/Properties/AssemblyInfo.cs b/src/Identity/Extensions.Core/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Identity/Identity/Core/src/Properties/AssemblyInfo.cs rename to src/Identity/Extensions.Core/src/Properties/AssemblyInfo.cs diff --git a/src/Identity/Extensions/Core/src/Properties/Resources.Designer.cs b/src/Identity/Extensions.Core/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Identity/Extensions/Core/src/Properties/Resources.Designer.cs rename to src/Identity/Extensions.Core/src/Properties/Resources.Designer.cs diff --git a/src/Identity/Extensions/Core/src/ProtectedPersonalDataAttribute.cs b/src/Identity/Extensions.Core/src/ProtectedPersonalDataAttribute.cs similarity index 100% rename from src/Identity/Extensions/Core/src/ProtectedPersonalDataAttribute.cs rename to src/Identity/Extensions.Core/src/ProtectedPersonalDataAttribute.cs diff --git a/src/Identity/Extensions/Core/src/Resources.resx b/src/Identity/Extensions.Core/src/Resources.resx similarity index 100% rename from src/Identity/Extensions/Core/src/Resources.resx rename to src/Identity/Extensions.Core/src/Resources.resx diff --git a/src/Identity/Extensions/Core/src/Rfc6238AuthenticationService.cs b/src/Identity/Extensions.Core/src/Rfc6238AuthenticationService.cs similarity index 100% rename from src/Identity/Extensions/Core/src/Rfc6238AuthenticationService.cs rename to src/Identity/Extensions.Core/src/Rfc6238AuthenticationService.cs diff --git a/src/Identity/Extensions/Core/src/RoleManager.cs b/src/Identity/Extensions.Core/src/RoleManager.cs similarity index 100% rename from src/Identity/Extensions/Core/src/RoleManager.cs rename to src/Identity/Extensions.Core/src/RoleManager.cs diff --git a/src/Identity/Extensions/Core/src/RoleValidator.cs b/src/Identity/Extensions.Core/src/RoleValidator.cs similarity index 100% rename from src/Identity/Extensions/Core/src/RoleValidator.cs rename to src/Identity/Extensions.Core/src/RoleValidator.cs diff --git a/src/Identity/Extensions/Core/src/SignInOptions.cs b/src/Identity/Extensions.Core/src/SignInOptions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/SignInOptions.cs rename to src/Identity/Extensions.Core/src/SignInOptions.cs diff --git a/src/Identity/Extensions/Core/src/SignInResult.cs b/src/Identity/Extensions.Core/src/SignInResult.cs similarity index 100% rename from src/Identity/Extensions/Core/src/SignInResult.cs rename to src/Identity/Extensions.Core/src/SignInResult.cs diff --git a/src/Identity/Extensions/Core/src/StoreOptions.cs b/src/Identity/Extensions.Core/src/StoreOptions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/StoreOptions.cs rename to src/Identity/Extensions.Core/src/StoreOptions.cs diff --git a/src/Identity/Extensions/Core/src/TokenOptions.cs b/src/Identity/Extensions.Core/src/TokenOptions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/TokenOptions.cs rename to src/Identity/Extensions.Core/src/TokenOptions.cs diff --git a/src/Identity/Extensions/Core/src/TokenProviderDescriptor.cs b/src/Identity/Extensions.Core/src/TokenProviderDescriptor.cs similarity index 100% rename from src/Identity/Extensions/Core/src/TokenProviderDescriptor.cs rename to src/Identity/Extensions.Core/src/TokenProviderDescriptor.cs diff --git a/src/Identity/Extensions/Core/src/TotpSecurityStampBasedTokenProvider.cs b/src/Identity/Extensions.Core/src/TotpSecurityStampBasedTokenProvider.cs similarity index 100% rename from src/Identity/Extensions/Core/src/TotpSecurityStampBasedTokenProvider.cs rename to src/Identity/Extensions.Core/src/TotpSecurityStampBasedTokenProvider.cs diff --git a/src/Identity/Extensions/Core/src/UpperInvariantLookupNormalizer.cs b/src/Identity/Extensions.Core/src/UpperInvariantLookupNormalizer.cs similarity index 100% rename from src/Identity/Extensions/Core/src/UpperInvariantLookupNormalizer.cs rename to src/Identity/Extensions.Core/src/UpperInvariantLookupNormalizer.cs diff --git a/src/Identity/Extensions/Core/src/UserClaimsPrincipalFactory.cs b/src/Identity/Extensions.Core/src/UserClaimsPrincipalFactory.cs similarity index 100% rename from src/Identity/Extensions/Core/src/UserClaimsPrincipalFactory.cs rename to src/Identity/Extensions.Core/src/UserClaimsPrincipalFactory.cs diff --git a/src/Identity/Extensions/Core/src/UserLoginInfo.cs b/src/Identity/Extensions.Core/src/UserLoginInfo.cs similarity index 100% rename from src/Identity/Extensions/Core/src/UserLoginInfo.cs rename to src/Identity/Extensions.Core/src/UserLoginInfo.cs diff --git a/src/Identity/Extensions/Core/src/UserManager.cs b/src/Identity/Extensions.Core/src/UserManager.cs similarity index 100% rename from src/Identity/Extensions/Core/src/UserManager.cs rename to src/Identity/Extensions.Core/src/UserManager.cs diff --git a/src/Identity/Extensions/Core/src/UserOptions.cs b/src/Identity/Extensions.Core/src/UserOptions.cs similarity index 100% rename from src/Identity/Extensions/Core/src/UserOptions.cs rename to src/Identity/Extensions.Core/src/UserOptions.cs diff --git a/src/Identity/Extensions/Core/src/UserValidator.cs b/src/Identity/Extensions.Core/src/UserValidator.cs similarity index 100% rename from src/Identity/Extensions/Core/src/UserValidator.cs rename to src/Identity/Extensions.Core/src/UserValidator.cs diff --git a/src/Identity/Extensions/Core/src/baseline.netcore.json b/src/Identity/Extensions.Core/src/baseline.netcore.json similarity index 100% rename from src/Identity/Extensions/Core/src/baseline.netcore.json rename to src/Identity/Extensions.Core/src/baseline.netcore.json diff --git a/src/Identity/Extensions/Stores/src/IdentityRole.cs b/src/Identity/Extensions.Stores/src/IdentityRole.cs similarity index 100% rename from src/Identity/Extensions/Stores/src/IdentityRole.cs rename to src/Identity/Extensions.Stores/src/IdentityRole.cs diff --git a/src/Identity/Extensions/Stores/src/IdentityRoleClaim.cs b/src/Identity/Extensions.Stores/src/IdentityRoleClaim.cs similarity index 100% rename from src/Identity/Extensions/Stores/src/IdentityRoleClaim.cs rename to src/Identity/Extensions.Stores/src/IdentityRoleClaim.cs diff --git a/src/Identity/Extensions/Stores/src/IdentityUser.cs b/src/Identity/Extensions.Stores/src/IdentityUser.cs similarity index 100% rename from src/Identity/Extensions/Stores/src/IdentityUser.cs rename to src/Identity/Extensions.Stores/src/IdentityUser.cs diff --git a/src/Identity/Extensions/Stores/src/IdentityUserClaim.cs b/src/Identity/Extensions.Stores/src/IdentityUserClaim.cs similarity index 100% rename from src/Identity/Extensions/Stores/src/IdentityUserClaim.cs rename to src/Identity/Extensions.Stores/src/IdentityUserClaim.cs diff --git a/src/Identity/Extensions/Stores/src/IdentityUserLogin.cs b/src/Identity/Extensions.Stores/src/IdentityUserLogin.cs similarity index 100% rename from src/Identity/Extensions/Stores/src/IdentityUserLogin.cs rename to src/Identity/Extensions.Stores/src/IdentityUserLogin.cs diff --git a/src/Identity/Extensions/Stores/src/IdentityUserRole.cs b/src/Identity/Extensions.Stores/src/IdentityUserRole.cs similarity index 100% rename from src/Identity/Extensions/Stores/src/IdentityUserRole.cs rename to src/Identity/Extensions.Stores/src/IdentityUserRole.cs diff --git a/src/Identity/Extensions/Stores/src/IdentityUserToken.cs b/src/Identity/Extensions.Stores/src/IdentityUserToken.cs similarity index 100% rename from src/Identity/Extensions/Stores/src/IdentityUserToken.cs rename to src/Identity/Extensions.Stores/src/IdentityUserToken.cs diff --git a/src/Identity/Extensions/Stores/src/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj similarity index 100% rename from src/Identity/Extensions/Stores/src/Microsoft.Extensions.Identity.Stores.csproj rename to src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj diff --git a/src/Identity/Extensions/Stores/src/RoleStoreBase.cs b/src/Identity/Extensions.Stores/src/RoleStoreBase.cs similarity index 100% rename from src/Identity/Extensions/Stores/src/RoleStoreBase.cs rename to src/Identity/Extensions.Stores/src/RoleStoreBase.cs diff --git a/src/Identity/Extensions/Stores/src/UserStoreBase.cs b/src/Identity/Extensions.Stores/src/UserStoreBase.cs similarity index 100% rename from src/Identity/Extensions/Stores/src/UserStoreBase.cs rename to src/Identity/Extensions.Stores/src/UserStoreBase.cs diff --git a/src/Identity/Extensions/Stores/src/baseline.netcore.json b/src/Identity/Extensions.Stores/src/baseline.netcore.json similarity index 100% rename from src/Identity/Extensions/Stores/src/baseline.netcore.json rename to src/Identity/Extensions.Stores/src/baseline.netcore.json diff --git a/src/Identity/Identity.sln b/src/Identity/Identity.sln index 75fe67206a..ea87790dda 100644 --- a/src/Identity/Identity.sln +++ b/src/Identity/Identity.sln @@ -1,93 +1,91 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D}" +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "Core\src\Microsoft.AspNetCore.Identity.csproj", "{B6AC3237-41CC-4799-9E4E-2A0D3283C834}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{46F9634A-91ED-48BE-BA27-A7561F85BF75}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "EntityFrameworkCore\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{470D3752-4253-4BE6-8EEC-647556FD6889}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "EntityFrameworkCore\test\EF.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "EntityFrameworkCore\test\EF.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{B7BAD5B7-66CA-4509-A390-BF2A06AF659B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "..\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{5215C432-FB85-4CD5-9E7D-7BE750236837}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "Extensions.Core\src\Microsoft.Extensions.Identity.Core.csproj", "{937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{15057F38-D71E-4016-9493-A089E30AF7B3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "Extensions.Stores\src\Microsoft.Extensions.Identity.Stores.csproj", "{2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{44BFF01A-C29F-46D8-BF5F-4A1690D386E5}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{7F5A4F96-E847-486E-8278-FE72E68C5810}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{5710DBA7-53D9-4341-BF04-00AB1839B99B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{B9A44F66-42AF-450D-9E34-7DD79869F225}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{36682549-97F8-45E4-A4C8-C868D9E698B9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{D67C2ED8-55FD-4D57-8A4F-C6983265A745}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "EF\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{8E3553B9-5197-4CE7-A678-A224B41A5259}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "EF\test\EF.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{9522CE22-FD8E-4193-8507-F2DB94D074EE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.FunctionalTests", "test\Identity.FunctionalTests\Microsoft.AspNetCore.Identity.FunctionalTests.csproj", "{FE4C359B-0155-4C07-8797-A33291B7A5EA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "EF\test\EF.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{3DDF86A8-1385-44B1-A6D4-36E92F58538F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{08B472C6-1859-4E22-8F91-2742DD9DC48D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{29AC3D1D-1BA3-4546-AF70-EEEDDD91E419}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DCB90F05-3824-45D8-943C-34568C26CBDF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{35C96499-4B59-44A2-B09B-83D3BEA9E45F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4A07C63B-C891-44BE-A61C-384E066FBCA7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "UI\src\Microsoft.AspNetCore.Identity.UI.csproj", "{29890CAC-D5AC-4644-9337-CF853683423F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{7AF5097F-8F34-4BB0-9D07-D4546196FB15}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{EEF25A64-AE4E-4B15-8045-F26EC6DD2996}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{3BAE2AA9-B3F4-4562-B4BD-25FDC959A324}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{913C4E0B-64A2-4655-A2FD-EF72A3471AD4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "Identity\samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{CF5345B3-EEF7-4CFC-B963-D34E47F697A5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "Identity\samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{C763AABD-4B9A-4BE5-9DED-C980FD76BC53}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeWPFClient", "Identity\samples\NativeWPFClient\NativeWPFClient.csproj", "{39AA4E4D-5E62-4213-8641-BF8012D45DE4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{2684E887-6DE3-4BB8-9B8E-80791457092A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.FunctionalTests", "Identity\test\Identity.FunctionalTests\Microsoft.AspNetCore.Identity.FunctionalTests.csproj", "{2284A207-D296-4E05-AC7B-B975EECA32D4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrite", "..\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj", "{B23309CC-4FBF-402F-8926-D6EDB738784B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "Identity\test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Twitter", "..\Security\Authentication\Twitter\src\Microsoft.AspNetCore.Authentication.Twitter.csproj", "{08A04E75-10E7-4FBC-8B4B-664345E8BEEC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "Identity\test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{CAB40170-1421-479C-90C8-A371418B129F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{21A8B5F0-9063-4A0E-9A6E-496977534203}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "Identity\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{031CB4EE-B043-4FC6-9D02-18EC60D47B87}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Facebook", "..\Security\Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj", "{6AF1AB00-AC66-4E6A-A4EF-F234245AD305}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{D3EEC342-6362-4C61-9E42-957063901C10}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "..\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj", "{C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{3305D777-062C-4F8B-BCA6-23C1871504F8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Twitter", "..\Security\Authentication\Twitter\src\Microsoft.AspNetCore.Authentication.Twitter.csproj", "{FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{EE1D2A07-6916-4005-A436-E429BD37B2CA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{5A3F9FE4-60E5-481E-BD8B-207B50E09C49}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "Extensions\Stores\src\Microsoft.Extensions.Identity.Stores.csproj", "{11826DEB-AE94-4B3F-A488-A51E74EC54BC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{359D1811-5249-41AF-AE21-E3032AC1F9FB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "Extensions\Core\src\Microsoft.Extensions.Identity.Core.csproj", "{08A29FAA-F7EF-4C19-B778-549249CAC12F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "..\DataProtection\DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{695B250A-0B2B-4C64-B90D-0547D446437B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EF", "EF", "{1BBC85BA-23B4-497F-AE6B-B79B8A9280F1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "..\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj", "{9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "Identity\Core\src\Microsoft.AspNetCore.Identity.csproj", "{69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj", "{3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "..\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Facebook", "..\Security\Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj", "{C260677E-6DDA-46EF-B522-86273D9AB4CF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrite", "..\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj", "{34C4C369-181A-4D75-A57F-A2FA7812C443}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{B253FFAE-6FAD-4D41-BCA0-828A05DE9021}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{71599893-1998-4F4D-A308-16DF48B97E2D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{51E1D0C2-A23A-4D6A-A22C-354E6DD98CD2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{03D80D01-8D41-4E27-BC58-215893414F24}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{F1CF8EA9-7498-4416-B711-B93A1B4656E1}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B37F6353-04EE-4ACD-8051-86AA09B26236}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -99,472 +97,507 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|x64.ActiveCfg = Debug|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|x64.Build.0 = Debug|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|x86.ActiveCfg = Debug|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Debug|x86.Build.0 = Debug|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|Any CPU.Build.0 = Release|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|x64.ActiveCfg = Release|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|x64.Build.0 = Release|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|x86.ActiveCfg = Release|Any CPU - {46F9634A-91ED-48BE-BA27-A7561F85BF75}.Release|x86.Build.0 = Release|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|x64.ActiveCfg = Debug|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|x64.Build.0 = Debug|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|x86.ActiveCfg = Debug|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Debug|x86.Build.0 = Debug|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|Any CPU.Build.0 = Release|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|x64.ActiveCfg = Release|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|x64.Build.0 = Release|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|x86.ActiveCfg = Release|Any CPU - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1}.Release|x86.Build.0 = Release|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|x64.ActiveCfg = Debug|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|x64.Build.0 = Debug|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|x86.ActiveCfg = Debug|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Debug|x86.Build.0 = Debug|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|Any CPU.Build.0 = Release|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|x64.ActiveCfg = Release|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|x64.Build.0 = Release|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|x86.ActiveCfg = Release|Any CPU - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6}.Release|x86.Build.0 = Release|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|x64.ActiveCfg = Debug|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|x64.Build.0 = Debug|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|x86.ActiveCfg = Debug|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Debug|x86.Build.0 = Debug|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|Any CPU.Build.0 = Release|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|x64.ActiveCfg = Release|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|x64.Build.0 = Release|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|x86.ActiveCfg = Release|Any CPU - {5215C432-FB85-4CD5-9E7D-7BE750236837}.Release|x86.Build.0 = Release|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|x64.ActiveCfg = Debug|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|x64.Build.0 = Debug|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|x86.ActiveCfg = Debug|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Debug|x86.Build.0 = Debug|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|Any CPU.Build.0 = Release|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|x64.ActiveCfg = Release|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|x64.Build.0 = Release|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|x86.ActiveCfg = Release|Any CPU - {15057F38-D71E-4016-9493-A089E30AF7B3}.Release|x86.Build.0 = Release|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|x64.ActiveCfg = Debug|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|x64.Build.0 = Debug|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|x86.ActiveCfg = Debug|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Debug|x86.Build.0 = Debug|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|Any CPU.Build.0 = Release|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|x64.ActiveCfg = Release|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|x64.Build.0 = Release|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|x86.ActiveCfg = Release|Any CPU - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5}.Release|x86.Build.0 = Release|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|x64.ActiveCfg = Debug|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|x64.Build.0 = Debug|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|x86.ActiveCfg = Debug|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Debug|x86.Build.0 = Debug|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|Any CPU.Build.0 = Release|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|x64.ActiveCfg = Release|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|x64.Build.0 = Release|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|x86.ActiveCfg = Release|Any CPU - {5710DBA7-53D9-4341-BF04-00AB1839B99B}.Release|x86.Build.0 = Release|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|x64.ActiveCfg = Debug|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|x64.Build.0 = Debug|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|x86.ActiveCfg = Debug|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Debug|x86.Build.0 = Debug|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|Any CPU.Build.0 = Release|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|x64.ActiveCfg = Release|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|x64.Build.0 = Release|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|x86.ActiveCfg = Release|Any CPU - {36682549-97F8-45E4-A4C8-C868D9E698B9}.Release|x86.Build.0 = Release|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|x64.ActiveCfg = Debug|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|x64.Build.0 = Debug|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|x86.ActiveCfg = Debug|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Debug|x86.Build.0 = Debug|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|Any CPU.Build.0 = Release|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|x64.ActiveCfg = Release|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|x64.Build.0 = Release|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|x86.ActiveCfg = Release|Any CPU - {8E3553B9-5197-4CE7-A678-A224B41A5259}.Release|x86.Build.0 = Release|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|x64.ActiveCfg = Debug|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|x64.Build.0 = Debug|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|x86.ActiveCfg = Debug|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Debug|x86.Build.0 = Debug|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|Any CPU.Build.0 = Release|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|x64.ActiveCfg = Release|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|x64.Build.0 = Release|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|x86.ActiveCfg = Release|Any CPU - {9522CE22-FD8E-4193-8507-F2DB94D074EE}.Release|x86.Build.0 = Release|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|x64.ActiveCfg = Debug|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|x64.Build.0 = Debug|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|x86.ActiveCfg = Debug|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Debug|x86.Build.0 = Debug|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|Any CPU.Build.0 = Release|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|x64.ActiveCfg = Release|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|x64.Build.0 = Release|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|x86.ActiveCfg = Release|Any CPU - {3DDF86A8-1385-44B1-A6D4-36E92F58538F}.Release|x86.Build.0 = Release|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|x64.ActiveCfg = Debug|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|x64.Build.0 = Debug|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|x86.ActiveCfg = Debug|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Debug|x86.Build.0 = Debug|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|Any CPU.Build.0 = Release|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|x64.ActiveCfg = Release|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|x64.Build.0 = Release|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|x86.ActiveCfg = Release|Any CPU - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE}.Release|x86.Build.0 = Release|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|x64.ActiveCfg = Debug|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|x64.Build.0 = Debug|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|x86.ActiveCfg = Debug|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Debug|x86.Build.0 = Debug|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|Any CPU.Build.0 = Release|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|x64.ActiveCfg = Release|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|x64.Build.0 = Release|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|x86.ActiveCfg = Release|Any CPU - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E}.Release|x86.Build.0 = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|x64.ActiveCfg = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|x64.Build.0 = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|x86.ActiveCfg = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Debug|x86.Build.0 = Debug|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|Any CPU.Build.0 = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|x64.ActiveCfg = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|x64.Build.0 = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|x86.ActiveCfg = Release|Any CPU - {39AA4E4D-5E62-4213-8641-BF8012D45DE4}.Release|x86.Build.0 = Release|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|x64.ActiveCfg = Debug|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|x64.Build.0 = Debug|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|x86.ActiveCfg = Debug|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Debug|x86.Build.0 = Debug|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|Any CPU.Build.0 = Release|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|x64.ActiveCfg = Release|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|x64.Build.0 = Release|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|x86.ActiveCfg = Release|Any CPU - {2284A207-D296-4E05-AC7B-B975EECA32D4}.Release|x86.Build.0 = Release|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|x64.ActiveCfg = Debug|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|x64.Build.0 = Debug|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|x86.ActiveCfg = Debug|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Debug|x86.Build.0 = Debug|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|Any CPU.Build.0 = Release|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|x64.ActiveCfg = Release|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|x64.Build.0 = Release|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|x86.ActiveCfg = Release|Any CPU - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5}.Release|x86.Build.0 = Release|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Debug|x64.ActiveCfg = Debug|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Debug|x64.Build.0 = Debug|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Debug|x86.ActiveCfg = Debug|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Debug|x86.Build.0 = Debug|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Release|Any CPU.Build.0 = Release|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Release|x64.ActiveCfg = Release|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Release|x64.Build.0 = Release|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Release|x86.ActiveCfg = Release|Any CPU - {CAB40170-1421-479C-90C8-A371418B129F}.Release|x86.Build.0 = Release|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|x64.ActiveCfg = Debug|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|x64.Build.0 = Debug|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|x86.ActiveCfg = Debug|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Debug|x86.Build.0 = Debug|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|Any CPU.Build.0 = Release|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|x64.ActiveCfg = Release|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|x64.Build.0 = Release|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|x86.ActiveCfg = Release|Any CPU - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2}.Release|x86.Build.0 = Release|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|x64.ActiveCfg = Debug|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|x64.Build.0 = Debug|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|x86.ActiveCfg = Debug|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Debug|x86.Build.0 = Debug|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|Any CPU.Build.0 = Release|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|x64.ActiveCfg = Release|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|x64.Build.0 = Release|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|x86.ActiveCfg = Release|Any CPU - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305}.Release|x86.Build.0 = Release|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|x64.ActiveCfg = Debug|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|x64.Build.0 = Debug|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|x86.ActiveCfg = Debug|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Debug|x86.Build.0 = Debug|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|Any CPU.Build.0 = Release|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|x64.ActiveCfg = Release|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|x64.Build.0 = Release|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|x86.ActiveCfg = Release|Any CPU - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667}.Release|x86.Build.0 = Release|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|x64.ActiveCfg = Debug|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|x64.Build.0 = Debug|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|x86.ActiveCfg = Debug|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Debug|x86.Build.0 = Debug|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|Any CPU.Build.0 = Release|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|x64.ActiveCfg = Release|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|x64.Build.0 = Release|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|x86.ActiveCfg = Release|Any CPU - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231}.Release|x86.Build.0 = Release|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|x64.ActiveCfg = Debug|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|x64.Build.0 = Debug|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|x86.ActiveCfg = Debug|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Debug|x86.Build.0 = Debug|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|Any CPU.Build.0 = Release|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|x64.ActiveCfg = Release|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|x64.Build.0 = Release|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|x86.ActiveCfg = Release|Any CPU - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33}.Release|x86.Build.0 = Release|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|x64.ActiveCfg = Debug|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|x64.Build.0 = Debug|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|x86.ActiveCfg = Debug|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Debug|x86.Build.0 = Debug|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|Any CPU.Build.0 = Release|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|x64.ActiveCfg = Release|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|x64.Build.0 = Release|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|x86.ActiveCfg = Release|Any CPU - {11826DEB-AE94-4B3F-A488-A51E74EC54BC}.Release|x86.Build.0 = Release|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|x64.ActiveCfg = Debug|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|x64.Build.0 = Debug|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|x86.ActiveCfg = Debug|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Debug|x86.Build.0 = Debug|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|Any CPU.Build.0 = Release|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|x64.ActiveCfg = Release|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|x64.Build.0 = Release|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|x86.ActiveCfg = Release|Any CPU - {08A29FAA-F7EF-4C19-B778-549249CAC12F}.Release|x86.Build.0 = Release|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|x64.ActiveCfg = Debug|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|x64.Build.0 = Debug|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|x86.ActiveCfg = Debug|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Debug|x86.Build.0 = Debug|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|Any CPU.Build.0 = Release|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|x64.ActiveCfg = Release|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|x64.Build.0 = Release|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|x86.ActiveCfg = Release|Any CPU - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1}.Release|x86.Build.0 = Release|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|x64.ActiveCfg = Debug|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|x64.Build.0 = Debug|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|x86.ActiveCfg = Debug|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Debug|x86.Build.0 = Debug|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|Any CPU.Build.0 = Release|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|x64.ActiveCfg = Release|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|x64.Build.0 = Release|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|x86.ActiveCfg = Release|Any CPU - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D}.Release|x86.Build.0 = Release|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|x64.ActiveCfg = Debug|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|x64.Build.0 = Debug|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|x86.ActiveCfg = Debug|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Debug|x86.Build.0 = Debug|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|Any CPU.Build.0 = Release|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|x64.ActiveCfg = Release|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|x64.Build.0 = Release|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|x86.ActiveCfg = Release|Any CPU - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6}.Release|x86.Build.0 = Release|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|x64.ActiveCfg = Debug|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|x64.Build.0 = Debug|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|x86.ActiveCfg = Debug|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Debug|x86.Build.0 = Debug|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|Any CPU.Build.0 = Release|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|x64.ActiveCfg = Release|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|x64.Build.0 = Release|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|x86.ActiveCfg = Release|Any CPU - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA}.Release|x86.Build.0 = Release|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|x64.ActiveCfg = Debug|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|x64.Build.0 = Debug|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|x86.ActiveCfg = Debug|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Debug|x86.Build.0 = Debug|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|Any CPU.Build.0 = Release|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|x64.ActiveCfg = Release|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|x64.Build.0 = Release|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|x86.ActiveCfg = Release|Any CPU - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB}.Release|x86.Build.0 = Release|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|x64.ActiveCfg = Debug|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|x64.Build.0 = Debug|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|x86.ActiveCfg = Debug|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Debug|x86.Build.0 = Debug|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|Any CPU.Build.0 = Release|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|x64.ActiveCfg = Release|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|x64.Build.0 = Release|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|x86.ActiveCfg = Release|Any CPU - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E}.Release|x86.Build.0 = Release|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|x64.ActiveCfg = Debug|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|x64.Build.0 = Debug|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|x86.ActiveCfg = Debug|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Debug|x86.Build.0 = Debug|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|Any CPU.Build.0 = Release|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|x64.ActiveCfg = Release|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|x64.Build.0 = Release|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|x86.ActiveCfg = Release|Any CPU - {34C4C369-181A-4D75-A57F-A2FA7812C443}.Release|x86.Build.0 = Release|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|x64.ActiveCfg = Debug|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|x64.Build.0 = Debug|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|x86.ActiveCfg = Debug|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Debug|x86.Build.0 = Debug|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|Any CPU.Build.0 = Release|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|x64.ActiveCfg = Release|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|x64.Build.0 = Release|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|x86.ActiveCfg = Release|Any CPU - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021}.Release|x86.Build.0 = Release|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|x64.ActiveCfg = Debug|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|x64.Build.0 = Debug|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|x86.ActiveCfg = Debug|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Debug|x86.Build.0 = Debug|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|Any CPU.Build.0 = Release|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|x64.ActiveCfg = Release|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|x64.Build.0 = Release|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|x86.ActiveCfg = Release|Any CPU - {71599893-1998-4F4D-A308-16DF48B97E2D}.Release|x86.Build.0 = Release|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|x64.ActiveCfg = Debug|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|x64.Build.0 = Debug|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|x86.ActiveCfg = Debug|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Debug|x86.Build.0 = Debug|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Release|Any CPU.Build.0 = Release|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Release|x64.ActiveCfg = Release|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Release|x64.Build.0 = Release|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Release|x86.ActiveCfg = Release|Any CPU - {03D80D01-8D41-4E27-BC58-215893414F24}.Release|x86.Build.0 = Release|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|x64.ActiveCfg = Debug|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|x64.Build.0 = Debug|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|x86.ActiveCfg = Debug|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Debug|x86.Build.0 = Debug|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|Any CPU.Build.0 = Release|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|x64.ActiveCfg = Release|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|x64.Build.0 = Release|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|x86.ActiveCfg = Release|Any CPU - {F1CF8EA9-7498-4416-B711-B93A1B4656E1}.Release|x86.Build.0 = Release|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Debug|x64.ActiveCfg = Debug|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Debug|x64.Build.0 = Debug|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Debug|x86.ActiveCfg = Debug|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Debug|x86.Build.0 = Debug|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Release|Any CPU.Build.0 = Release|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Release|x64.ActiveCfg = Release|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Release|x64.Build.0 = Release|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Release|x86.ActiveCfg = Release|Any CPU + {B6AC3237-41CC-4799-9E4E-2A0D3283C834}.Release|x86.Build.0 = Release|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Debug|Any CPU.Build.0 = Debug|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Debug|x64.ActiveCfg = Debug|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Debug|x64.Build.0 = Debug|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Debug|x86.ActiveCfg = Debug|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Debug|x86.Build.0 = Debug|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Release|Any CPU.ActiveCfg = Release|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Release|Any CPU.Build.0 = Release|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Release|x64.ActiveCfg = Release|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Release|x64.Build.0 = Release|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Release|x86.ActiveCfg = Release|Any CPU + {470D3752-4253-4BE6-8EEC-647556FD6889}.Release|x86.Build.0 = Release|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Debug|Any CPU.Build.0 = Debug|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Debug|x64.ActiveCfg = Debug|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Debug|x64.Build.0 = Debug|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Debug|x86.ActiveCfg = Debug|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Debug|x86.Build.0 = Debug|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Release|Any CPU.ActiveCfg = Release|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Release|Any CPU.Build.0 = Release|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Release|x64.ActiveCfg = Release|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Release|x64.Build.0 = Release|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Release|x86.ActiveCfg = Release|Any CPU + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057}.Release|x86.Build.0 = Release|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Debug|x64.ActiveCfg = Debug|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Debug|x64.Build.0 = Debug|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Debug|x86.ActiveCfg = Debug|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Debug|x86.Build.0 = Debug|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Release|Any CPU.Build.0 = Release|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Release|x64.ActiveCfg = Release|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Release|x64.Build.0 = Release|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Release|x86.ActiveCfg = Release|Any CPU + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B}.Release|x86.Build.0 = Release|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Debug|x64.ActiveCfg = Debug|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Debug|x64.Build.0 = Debug|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Debug|x86.ActiveCfg = Debug|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Debug|x86.Build.0 = Debug|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Release|Any CPU.Build.0 = Release|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Release|x64.ActiveCfg = Release|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Release|x64.Build.0 = Release|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Release|x86.ActiveCfg = Release|Any CPU + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F}.Release|x86.Build.0 = Release|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Debug|x64.ActiveCfg = Debug|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Debug|x64.Build.0 = Debug|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Debug|x86.ActiveCfg = Debug|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Debug|x86.Build.0 = Debug|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Release|Any CPU.Build.0 = Release|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Release|x64.ActiveCfg = Release|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Release|x64.Build.0 = Release|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Release|x86.ActiveCfg = Release|Any CPU + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E}.Release|x86.Build.0 = Release|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Debug|x64.ActiveCfg = Debug|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Debug|x64.Build.0 = Debug|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Debug|x86.ActiveCfg = Debug|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Debug|x86.Build.0 = Debug|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Release|Any CPU.Build.0 = Release|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Release|x64.ActiveCfg = Release|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Release|x64.Build.0 = Release|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Release|x86.ActiveCfg = Release|Any CPU + {B9A44F66-42AF-450D-9E34-7DD79869F225}.Release|x86.Build.0 = Release|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Debug|x64.ActiveCfg = Debug|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Debug|x64.Build.0 = Debug|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Debug|x86.ActiveCfg = Debug|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Debug|x86.Build.0 = Debug|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Release|Any CPU.Build.0 = Release|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Release|x64.ActiveCfg = Release|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Release|x64.Build.0 = Release|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Release|x86.ActiveCfg = Release|Any CPU + {D67C2ED8-55FD-4D57-8A4F-C6983265A745}.Release|x86.Build.0 = Release|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Debug|x64.ActiveCfg = Debug|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Debug|x64.Build.0 = Debug|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Debug|x86.ActiveCfg = Debug|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Debug|x86.Build.0 = Debug|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Release|Any CPU.Build.0 = Release|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Release|x64.ActiveCfg = Release|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Release|x64.Build.0 = Release|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Release|x86.ActiveCfg = Release|Any CPU + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B}.Release|x86.Build.0 = Release|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Debug|x64.ActiveCfg = Debug|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Debug|x64.Build.0 = Debug|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Debug|x86.ActiveCfg = Debug|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Debug|x86.Build.0 = Debug|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Release|Any CPU.Build.0 = Release|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Release|x64.ActiveCfg = Release|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Release|x64.Build.0 = Release|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Release|x86.ActiveCfg = Release|Any CPU + {FE4C359B-0155-4C07-8797-A33291B7A5EA}.Release|x86.Build.0 = Release|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Debug|x64.ActiveCfg = Debug|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Debug|x64.Build.0 = Debug|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Debug|x86.ActiveCfg = Debug|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Debug|x86.Build.0 = Debug|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Release|Any CPU.Build.0 = Release|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Release|x64.ActiveCfg = Release|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Release|x64.Build.0 = Release|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Release|x86.ActiveCfg = Release|Any CPU + {08B472C6-1859-4E22-8F91-2742DD9DC48D}.Release|x86.Build.0 = Release|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Debug|x64.ActiveCfg = Debug|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Debug|x64.Build.0 = Debug|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Debug|x86.ActiveCfg = Debug|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Debug|x86.Build.0 = Debug|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Release|Any CPU.Build.0 = Release|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Release|x64.ActiveCfg = Release|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Release|x64.Build.0 = Release|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Release|x86.ActiveCfg = Release|Any CPU + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA}.Release|x86.Build.0 = Release|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Debug|x64.ActiveCfg = Debug|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Debug|x64.Build.0 = Debug|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Debug|x86.ActiveCfg = Debug|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Debug|x86.Build.0 = Debug|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Release|Any CPU.Build.0 = Release|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Release|x64.ActiveCfg = Release|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Release|x64.Build.0 = Release|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Release|x86.ActiveCfg = Release|Any CPU + {35C96499-4B59-44A2-B09B-83D3BEA9E45F}.Release|x86.Build.0 = Release|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Debug|x64.ActiveCfg = Debug|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Debug|x64.Build.0 = Debug|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Debug|x86.ActiveCfg = Debug|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Debug|x86.Build.0 = Debug|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Release|Any CPU.Build.0 = Release|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Release|x64.ActiveCfg = Release|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Release|x64.Build.0 = Release|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Release|x86.ActiveCfg = Release|Any CPU + {29890CAC-D5AC-4644-9337-CF853683423F}.Release|x86.Build.0 = Release|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Debug|x64.ActiveCfg = Debug|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Debug|x64.Build.0 = Debug|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Debug|x86.ActiveCfg = Debug|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Debug|x86.Build.0 = Debug|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Release|Any CPU.Build.0 = Release|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Release|x64.ActiveCfg = Release|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Release|x64.Build.0 = Release|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Release|x86.ActiveCfg = Release|Any CPU + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4}.Release|x86.Build.0 = Release|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Debug|x64.ActiveCfg = Debug|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Debug|x64.Build.0 = Debug|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Debug|x86.ActiveCfg = Debug|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Debug|x86.Build.0 = Debug|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Release|Any CPU.Build.0 = Release|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Release|x64.ActiveCfg = Release|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Release|x64.Build.0 = Release|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Release|x86.ActiveCfg = Release|Any CPU + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5}.Release|x86.Build.0 = Release|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Debug|x64.ActiveCfg = Debug|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Debug|x64.Build.0 = Debug|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Debug|x86.ActiveCfg = Debug|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Debug|x86.Build.0 = Debug|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Release|Any CPU.Build.0 = Release|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Release|x64.ActiveCfg = Release|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Release|x64.Build.0 = Release|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Release|x86.ActiveCfg = Release|Any CPU + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53}.Release|x86.Build.0 = Release|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Debug|x64.ActiveCfg = Debug|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Debug|x64.Build.0 = Debug|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Debug|x86.ActiveCfg = Debug|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Debug|x86.Build.0 = Debug|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Release|Any CPU.Build.0 = Release|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Release|x64.ActiveCfg = Release|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Release|x64.Build.0 = Release|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Release|x86.ActiveCfg = Release|Any CPU + {2684E887-6DE3-4BB8-9B8E-80791457092A}.Release|x86.Build.0 = Release|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Debug|x64.ActiveCfg = Debug|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Debug|x64.Build.0 = Debug|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Debug|x86.ActiveCfg = Debug|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Debug|x86.Build.0 = Debug|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Release|Any CPU.Build.0 = Release|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Release|x64.ActiveCfg = Release|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Release|x64.Build.0 = Release|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Release|x86.ActiveCfg = Release|Any CPU + {B23309CC-4FBF-402F-8926-D6EDB738784B}.Release|x86.Build.0 = Release|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Debug|x64.ActiveCfg = Debug|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Debug|x64.Build.0 = Debug|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Debug|x86.ActiveCfg = Debug|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Debug|x86.Build.0 = Debug|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Release|Any CPU.Build.0 = Release|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Release|x64.ActiveCfg = Release|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Release|x64.Build.0 = Release|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Release|x86.ActiveCfg = Release|Any CPU + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC}.Release|x86.Build.0 = Release|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Debug|x64.ActiveCfg = Debug|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Debug|x64.Build.0 = Debug|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Debug|x86.ActiveCfg = Debug|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Debug|x86.Build.0 = Debug|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Release|Any CPU.ActiveCfg = Release|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Release|Any CPU.Build.0 = Release|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Release|x64.ActiveCfg = Release|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Release|x64.Build.0 = Release|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Release|x86.ActiveCfg = Release|Any CPU + {21A8B5F0-9063-4A0E-9A6E-496977534203}.Release|x86.Build.0 = Release|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Debug|Any CPU.Build.0 = Debug|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Debug|x64.ActiveCfg = Debug|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Debug|x64.Build.0 = Debug|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Debug|x86.ActiveCfg = Debug|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Debug|x86.Build.0 = Debug|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Release|Any CPU.ActiveCfg = Release|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Release|Any CPU.Build.0 = Release|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Release|x64.ActiveCfg = Release|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Release|x64.Build.0 = Release|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Release|x86.ActiveCfg = Release|Any CPU + {031CB4EE-B043-4FC6-9D02-18EC60D47B87}.Release|x86.Build.0 = Release|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Debug|x64.ActiveCfg = Debug|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Debug|x64.Build.0 = Debug|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Debug|x86.ActiveCfg = Debug|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Debug|x86.Build.0 = Debug|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Release|Any CPU.Build.0 = Release|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Release|x64.ActiveCfg = Release|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Release|x64.Build.0 = Release|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Release|x86.ActiveCfg = Release|Any CPU + {D3EEC342-6362-4C61-9E42-957063901C10}.Release|x86.Build.0 = Release|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Debug|x64.ActiveCfg = Debug|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Debug|x64.Build.0 = Debug|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Debug|x86.ActiveCfg = Debug|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Debug|x86.Build.0 = Debug|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Release|Any CPU.Build.0 = Release|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Release|x64.ActiveCfg = Release|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Release|x64.Build.0 = Release|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Release|x86.ActiveCfg = Release|Any CPU + {3305D777-062C-4F8B-BCA6-23C1871504F8}.Release|x86.Build.0 = Release|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Debug|x64.ActiveCfg = Debug|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Debug|x64.Build.0 = Debug|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Debug|x86.ActiveCfg = Debug|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Debug|x86.Build.0 = Debug|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Release|Any CPU.Build.0 = Release|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Release|x64.ActiveCfg = Release|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Release|x64.Build.0 = Release|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Release|x86.ActiveCfg = Release|Any CPU + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA}.Release|x86.Build.0 = Release|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Debug|x64.ActiveCfg = Debug|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Debug|x64.Build.0 = Debug|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Debug|x86.ActiveCfg = Debug|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Debug|x86.Build.0 = Debug|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Release|Any CPU.Build.0 = Release|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Release|x64.ActiveCfg = Release|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Release|x64.Build.0 = Release|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Release|x86.ActiveCfg = Release|Any CPU + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA}.Release|x86.Build.0 = Release|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Debug|x64.ActiveCfg = Debug|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Debug|x64.Build.0 = Debug|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Debug|x86.ActiveCfg = Debug|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Debug|x86.Build.0 = Debug|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Release|Any CPU.Build.0 = Release|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Release|x64.ActiveCfg = Release|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Release|x64.Build.0 = Release|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Release|x86.ActiveCfg = Release|Any CPU + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49}.Release|x86.Build.0 = Release|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Debug|x64.ActiveCfg = Debug|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Debug|x64.Build.0 = Debug|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Debug|x86.ActiveCfg = Debug|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Debug|x86.Build.0 = Debug|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Release|Any CPU.Build.0 = Release|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Release|x64.ActiveCfg = Release|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Release|x64.Build.0 = Release|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Release|x86.ActiveCfg = Release|Any CPU + {359D1811-5249-41AF-AE21-E3032AC1F9FB}.Release|x86.Build.0 = Release|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Debug|x64.ActiveCfg = Debug|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Debug|x64.Build.0 = Debug|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Debug|x86.ActiveCfg = Debug|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Debug|x86.Build.0 = Debug|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Release|Any CPU.Build.0 = Release|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Release|x64.ActiveCfg = Release|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Release|x64.Build.0 = Release|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Release|x86.ActiveCfg = Release|Any CPU + {695B250A-0B2B-4C64-B90D-0547D446437B}.Release|x86.Build.0 = Release|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Debug|x64.ActiveCfg = Debug|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Debug|x64.Build.0 = Debug|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Debug|x86.ActiveCfg = Debug|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Debug|x86.Build.0 = Debug|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Release|Any CPU.Build.0 = Release|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Release|x64.ActiveCfg = Release|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Release|x64.Build.0 = Release|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Release|x86.ActiveCfg = Release|Any CPU + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94}.Release|x86.Build.0 = Release|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Debug|x64.ActiveCfg = Debug|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Debug|x64.Build.0 = Debug|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Debug|x86.ActiveCfg = Debug|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Debug|x86.Build.0 = Debug|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Release|Any CPU.Build.0 = Release|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Release|x64.ActiveCfg = Release|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Release|x64.Build.0 = Release|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Release|x86.ActiveCfg = Release|Any CPU + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509}.Release|x86.Build.0 = Release|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Debug|x64.ActiveCfg = Debug|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Debug|x64.Build.0 = Debug|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Debug|x86.ActiveCfg = Debug|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Debug|x86.Build.0 = Debug|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Release|Any CPU.Build.0 = Release|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Release|x64.ActiveCfg = Release|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Release|x64.Build.0 = Release|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Release|x86.ActiveCfg = Release|Any CPU + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1}.Release|x86.Build.0 = Release|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Debug|x64.ActiveCfg = Debug|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Debug|x64.Build.0 = Debug|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Debug|x86.ActiveCfg = Debug|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Debug|x86.Build.0 = Debug|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Release|Any CPU.Build.0 = Release|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Release|x64.ActiveCfg = Release|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Release|x64.Build.0 = Release|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Release|x86.ActiveCfg = Release|Any CPU + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28}.Release|x86.Build.0 = Release|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Debug|x64.ActiveCfg = Debug|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Debug|x64.Build.0 = Debug|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Debug|x86.ActiveCfg = Debug|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Debug|x86.Build.0 = Debug|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Release|Any CPU.Build.0 = Release|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Release|x64.ActiveCfg = Release|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Release|x64.Build.0 = Release|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Release|x86.ActiveCfg = Release|Any CPU + {C260677E-6DDA-46EF-B522-86273D9AB4CF}.Release|x86.Build.0 = Release|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Debug|x64.ActiveCfg = Debug|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Debug|x64.Build.0 = Debug|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Debug|x86.ActiveCfg = Debug|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Debug|x86.Build.0 = Debug|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Release|Any CPU.Build.0 = Release|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Release|x64.ActiveCfg = Release|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Release|x64.Build.0 = Release|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Release|x86.ActiveCfg = Release|Any CPU + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D}.Release|x86.Build.0 = Release|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Debug|x64.ActiveCfg = Debug|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Debug|x64.Build.0 = Debug|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Debug|x86.ActiveCfg = Debug|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Debug|x86.Build.0 = Debug|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Release|Any CPU.Build.0 = Release|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Release|x64.ActiveCfg = Release|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Release|x64.Build.0 = Release|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Release|x86.ActiveCfg = Release|Any CPU + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A}.Release|x86.Build.0 = Release|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Debug|x64.ActiveCfg = Debug|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Debug|x64.Build.0 = Debug|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Debug|x86.ActiveCfg = Debug|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Debug|x86.Build.0 = Debug|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Release|Any CPU.Build.0 = Release|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Release|x64.ActiveCfg = Release|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Release|x64.Build.0 = Release|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Release|x86.ActiveCfg = Release|Any CPU + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095}.Release|x86.Build.0 = Release|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Debug|x64.ActiveCfg = Debug|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Debug|x64.Build.0 = Debug|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Debug|x86.ActiveCfg = Debug|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Debug|x86.Build.0 = Debug|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Release|Any CPU.Build.0 = Release|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Release|x64.ActiveCfg = Release|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Release|x64.Build.0 = Release|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Release|x86.ActiveCfg = Release|Any CPU + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {46F9634A-91ED-48BE-BA27-A7561F85BF75} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {E6DDF9EB-A8D0-4AEB-9BCF-06B0C836CAE1} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {E5D10AE7-4390-44DE-88C5-4E6ADADDE1F6} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {5215C432-FB85-4CD5-9E7D-7BE750236837} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {15057F38-D71E-4016-9493-A089E30AF7B3} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {44BFF01A-C29F-46D8-BF5F-4A1690D386E5} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {5710DBA7-53D9-4341-BF04-00AB1839B99B} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {36682549-97F8-45E4-A4C8-C868D9E698B9} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {8E3553B9-5197-4CE7-A678-A224B41A5259} = {1BBC85BA-23B4-497F-AE6B-B79B8A9280F1} - {9522CE22-FD8E-4193-8507-F2DB94D074EE} = {1BBC85BA-23B4-497F-AE6B-B79B8A9280F1} - {3DDF86A8-1385-44B1-A6D4-36E92F58538F} = {1BBC85BA-23B4-497F-AE6B-B79B8A9280F1} - {DCB90F05-3824-45D8-943C-34568C26CBDF} = {1BBC85BA-23B4-497F-AE6B-B79B8A9280F1} - {4A07C63B-C891-44BE-A61C-384E066FBCA7} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} - {7AF5097F-8F34-4BB0-9D07-D4546196FB15} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} - {3BAE2AA9-B3F4-4562-B4BD-25FDC959A324} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} - {33FB07E4-6E0A-469D-BCDB-D83035D7DEFE} = {7AF5097F-8F34-4BB0-9D07-D4546196FB15} - {C4B24F4C-4D6B-4E43-9466-57F78EBECA2E} = {7AF5097F-8F34-4BB0-9D07-D4546196FB15} - {39AA4E4D-5E62-4213-8641-BF8012D45DE4} = {7AF5097F-8F34-4BB0-9D07-D4546196FB15} - {2284A207-D296-4E05-AC7B-B975EECA32D4} = {4A07C63B-C891-44BE-A61C-384E066FBCA7} - {7BE8ED61-A09D-4F97-9C5C-50C95E2BEEE5} = {4A07C63B-C891-44BE-A61C-384E066FBCA7} - {CAB40170-1421-479C-90C8-A371418B129F} = {4A07C63B-C891-44BE-A61C-384E066FBCA7} - {EA69CC22-386A-48DC-B5D3-4F27B1C02CC2} = {3BAE2AA9-B3F4-4562-B4BD-25FDC959A324} - {6AF1AB00-AC66-4E6A-A4EF-F234245AD305} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {C6385844-3A10-4D2C-BCA4-2DCBF0DF2667} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {FD5D2CAE-FA9E-44EF-99AC-4EB33A0CE231} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {6F0FF966-BDF9-48F2-B4ED-EDE3A337EC33} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {11826DEB-AE94-4B3F-A488-A51E74EC54BC} = {EE1D2A07-6916-4005-A436-E429BD37B2CA} - {08A29FAA-F7EF-4C19-B778-549249CAC12F} = {EE1D2A07-6916-4005-A436-E429BD37B2CA} - {69F74E7B-8E5F-462E-AFF3-2C9668E7C0A1} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} - {C8E8BAAE-81FA-4CED-8FD5-29648529BF9D} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} - {3DD2CB9C-6DF6-4F27-A101-BC588E0B9BD6} = {29AC3D1D-1BA3-4546-AF70-EEEDDD91E419} - {68DC5B5B-DE38-4A8B-9EE8-B5343AA655DA} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {4DFE4FB3-104E-41EA-A5BC-043F12DD3BEB} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {D2C1D13D-E6B4-4B56-B7EC-BB04FD53C32E} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {34C4C369-181A-4D75-A57F-A2FA7812C443} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {B253FFAE-6FAD-4D41-BCA0-828A05DE9021} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {71599893-1998-4F4D-A308-16DF48B97E2D} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {03D80D01-8D41-4E27-BC58-215893414F24} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} - {F1CF8EA9-7498-4416-B711-B93A1B4656E1} = {88DF7D46-14B3-45CF-B7FE-65E7EFDEB18D} + {B6AC3237-41CC-4799-9E4E-2A0D3283C834} = {51E1D0C2-A23A-4D6A-A22C-354E6DD98CD2} + {470D3752-4253-4BE6-8EEC-647556FD6889} = {51E1D0C2-A23A-4D6A-A22C-354E6DD98CD2} + {118A8DAF-ABA4-49CE-9E3C-6A93C85E1057} = {B37F6353-04EE-4ACD-8051-86AA09B26236} + {B7BAD5B7-66CA-4509-A390-BF2A06AF659B} = {B37F6353-04EE-4ACD-8051-86AA09B26236} + {937F5280-EE8C-4C0F-8DCE-BABA9DD29E8F} = {51E1D0C2-A23A-4D6A-A22C-354E6DD98CD2} + {2ED964ED-DD61-4E0C-A40F-9E706C5DED9E} = {51E1D0C2-A23A-4D6A-A22C-354E6DD98CD2} + {B9A44F66-42AF-450D-9E34-7DD79869F225} = {7F5A4F96-E847-486E-8278-FE72E68C5810} + {D67C2ED8-55FD-4D57-8A4F-C6983265A745} = {7F5A4F96-E847-486E-8278-FE72E68C5810} + {7AE1CE81-F93B-4E49-A481-1B0EE2EFDE0B} = {51E1D0C2-A23A-4D6A-A22C-354E6DD98CD2} + {FE4C359B-0155-4C07-8797-A33291B7A5EA} = {B37F6353-04EE-4ACD-8051-86AA09B26236} + {08B472C6-1859-4E22-8F91-2742DD9DC48D} = {B37F6353-04EE-4ACD-8051-86AA09B26236} + {83B37863-5C94-48E4-AAD6-1DF7E1D2FBFA} = {B37F6353-04EE-4ACD-8051-86AA09B26236} + {35C96499-4B59-44A2-B09B-83D3BEA9E45F} = {7F5A4F96-E847-486E-8278-FE72E68C5810} + {29890CAC-D5AC-4644-9337-CF853683423F} = {51E1D0C2-A23A-4D6A-A22C-354E6DD98CD2} + {913C4E0B-64A2-4655-A2FD-EF72A3471AD4} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {CF5345B3-EEF7-4CFC-B963-D34E47F697A5} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {C763AABD-4B9A-4BE5-9DED-C980FD76BC53} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {2684E887-6DE3-4BB8-9B8E-80791457092A} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {B23309CC-4FBF-402F-8926-D6EDB738784B} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {08A04E75-10E7-4FBC-8B4B-664345E8BEEC} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {21A8B5F0-9063-4A0E-9A6E-496977534203} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {031CB4EE-B043-4FC6-9D02-18EC60D47B87} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {D3EEC342-6362-4C61-9E42-957063901C10} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {3305D777-062C-4F8B-BCA6-23C1871504F8} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {06339361-AD2B-4EAD-B2B4-A5FF2462ACFA} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {A0001CC6-64EF-40A5-B18C-A7B870FEE7EA} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {5A3F9FE4-60E5-481E-BD8B-207B50E09C49} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {359D1811-5249-41AF-AE21-E3032AC1F9FB} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {695B250A-0B2B-4C64-B90D-0547D446437B} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {9866C7F8-CFAD-48EF-8FA7-8E513D4EEB94} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {0A7B4840-5C94-4AA4-B5FA-4B6FE1F24509} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {89D4ADBA-8124-4B4B-9E25-12FBF6976EE1} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {2ABD07B2-9CA8-4A8D-BD8D-275B5B6E4E28} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {C260677E-6DDA-46EF-B522-86273D9AB4CF} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {B1014D85-8CC5-495E-8AD2-BD5CFCB8FE2D} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {0B75D2E0-7B18-4DAF-848B-EE2C836F1B1A} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {BEFAC4AC-70FB-403C-AE5D-2E2CE3508095} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} + {A34551AD-DBC3-4BA0-B116-AEBA8C40E39B} = {EEF25A64-AE4E-4B15-8045-F26EC6DD2996} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {B3F2A592-CCE0-40C2-8CA4-7B1293DED874} + SolutionGuid = {37006CC5-F2DD-411A-BC9C-565614CD85CD} EndGlobalSection EndGlobal diff --git a/src/Identity/IdentityCore.sln b/src/Identity/IdentityCore.sln deleted file mode 100644 index bb5b5d81c2..0000000000 --- a/src/Identity/IdentityCore.sln +++ /dev/null @@ -1,693 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.10 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{C746D1C5-2031-486F-8C83-F89DFE1D6A3E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{C4104E84-CB85-49E3-BBC0-B765CB305788}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{3BB08B4D-D000-4EC6-BC1F-35ED347390C1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{F769B6CA-7E95-4067-A089-124D8C2944A1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{10A7B212-4571-40C4-AE10-E07F8B1B9F5C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "..\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{EB37060F-206D-4CC1-9A0C-9713CC624A8B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{55754A06-7449-48BE-AE8B-BD8CF2AB2E21}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EF", "EF", "{D08D46D8-9703-48C1-BFBA-3026FDF8B03A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C76A75DA-21D0-42D4-ADA7-B367829F0963}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "EF\test\EF.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{4F129D0D-A12B-43CA-96AB-8C02C31863D1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "EF\test\EF.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{05005187-7F69-476B-924B-2696AF99C34B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "EF\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "Extensions\Core\src\Microsoft.Extensions.Identity.Core.csproj", "{BAD15CD8-54DC-4060-A0D1-2DD890F65A41}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "Extensions\Stores\src\Microsoft.Extensions.Identity.Stores.csproj", "{63E0CB97-9992-4564-AB67-EF0122FDD93A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "Identity\Core\src\Microsoft.AspNetCore.Identity.csproj", "{3E91BC07-5930-4614-A19C-62077EF74574}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5AB3E84F-F8BD-4F60-874F-4CFCC9B5335E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.FunctionalTests", "Identity\test\Identity.FunctionalTests\Microsoft.AspNetCore.Identity.FunctionalTests.csproj", "{E9C13855-BB94-4A28-8FBA-27484F74F100}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "Identity\test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{8C2DFD1D-5BBD-4224-BD54-832127892943}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "Identity\test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{87F29291-B977-4B1B-A7B9-8B3F74CAB081}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{58C2C86F-BB43-4A98-8F7C-F3ECF3B72E2F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "Identity\samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{08A09391-C518-4ACC-97BE-6A64070599AC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "Identity\samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj", "{92FDB538-5287-4A94-9262-C5D935300FA7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{9F3C759D-918D-49D9-8B4C-15AD8D02253B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "Identity\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{416B3E62-5539-4715-AF78-68F003B2D4C5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{8A79EE3B-995B-4D31-86FA-924BA25ACD26}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrite", "..\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj", "{F7039174-4368-4686-B9C6-69E89A7B8588}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{4A26A4AE-8688-41E8-8996-BAA22157A982}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{F1D10473-3132-4030-86FB-93344923EF34}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{A2279F48-5A05-424D-90ED-822E13B9725E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Facebook", "..\Security\Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj", "{2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "..\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj", "{AB29DA92-CC87-48DD-9FB7-60B6785B8A63}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Twitter", "..\Security\Authentication\Twitter\src\Microsoft.AspNetCore.Authentication.Twitter.csproj", "{46DB470A-4AC1-4C01-A638-395151DF6369}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{4D13F98D-9AA6-431A-B089-68A05D0CE5C7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{4D26E405-1C9D-4FA4-9F28-C608E5C82992}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|x64.ActiveCfg = Debug|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|x64.Build.0 = Debug|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|x86.ActiveCfg = Debug|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Debug|x86.Build.0 = Debug|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|Any CPU.Build.0 = Release|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|x64.ActiveCfg = Release|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|x64.Build.0 = Release|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|x86.ActiveCfg = Release|Any CPU - {C4104E84-CB85-49E3-BBC0-B765CB305788}.Release|x86.Build.0 = Release|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|x64.ActiveCfg = Debug|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|x64.Build.0 = Debug|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|x86.ActiveCfg = Debug|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Debug|x86.Build.0 = Debug|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|Any CPU.Build.0 = Release|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|x64.ActiveCfg = Release|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|x64.Build.0 = Release|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|x86.ActiveCfg = Release|Any CPU - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1}.Release|x86.Build.0 = Release|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|x64.ActiveCfg = Debug|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|x64.Build.0 = Debug|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|x86.ActiveCfg = Debug|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Debug|x86.Build.0 = Debug|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|Any CPU.Build.0 = Release|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|x64.ActiveCfg = Release|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|x64.Build.0 = Release|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|x86.ActiveCfg = Release|Any CPU - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7}.Release|x86.Build.0 = Release|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|x64.ActiveCfg = Debug|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|x64.Build.0 = Debug|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|x86.ActiveCfg = Debug|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Debug|x86.Build.0 = Debug|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|Any CPU.Build.0 = Release|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|x64.ActiveCfg = Release|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|x64.Build.0 = Release|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|x86.ActiveCfg = Release|Any CPU - {F769B6CA-7E95-4067-A089-124D8C2944A1}.Release|x86.Build.0 = Release|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|x64.ActiveCfg = Debug|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|x64.Build.0 = Debug|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|x86.ActiveCfg = Debug|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Debug|x86.Build.0 = Debug|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|Any CPU.Build.0 = Release|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|x64.ActiveCfg = Release|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|x64.Build.0 = Release|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|x86.ActiveCfg = Release|Any CPU - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C}.Release|x86.Build.0 = Release|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|x64.ActiveCfg = Debug|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|x64.Build.0 = Debug|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|x86.ActiveCfg = Debug|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Debug|x86.Build.0 = Debug|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|Any CPU.Build.0 = Release|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|x64.ActiveCfg = Release|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|x64.Build.0 = Release|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|x86.ActiveCfg = Release|Any CPU - {EB37060F-206D-4CC1-9A0C-9713CC624A8B}.Release|x86.Build.0 = Release|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|x64.ActiveCfg = Debug|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|x64.Build.0 = Debug|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|x86.ActiveCfg = Debug|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Debug|x86.Build.0 = Debug|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|Any CPU.Build.0 = Release|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|x64.ActiveCfg = Release|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|x64.Build.0 = Release|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|x86.ActiveCfg = Release|Any CPU - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00}.Release|x86.Build.0 = Release|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|x64.ActiveCfg = Debug|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|x64.Build.0 = Debug|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|x86.ActiveCfg = Debug|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Debug|x86.Build.0 = Debug|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|Any CPU.Build.0 = Release|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|x64.ActiveCfg = Release|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|x64.Build.0 = Release|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|x86.ActiveCfg = Release|Any CPU - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2}.Release|x86.Build.0 = Release|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|x64.ActiveCfg = Debug|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|x64.Build.0 = Debug|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|x86.ActiveCfg = Debug|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Debug|x86.Build.0 = Debug|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|Any CPU.Build.0 = Release|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|x64.ActiveCfg = Release|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|x64.Build.0 = Release|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|x86.ActiveCfg = Release|Any CPU - {4F129D0D-A12B-43CA-96AB-8C02C31863D1}.Release|x86.Build.0 = Release|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Debug|x64.ActiveCfg = Debug|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Debug|x64.Build.0 = Debug|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Debug|x86.ActiveCfg = Debug|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Debug|x86.Build.0 = Debug|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Release|Any CPU.Build.0 = Release|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Release|x64.ActiveCfg = Release|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Release|x64.Build.0 = Release|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Release|x86.ActiveCfg = Release|Any CPU - {05005187-7F69-476B-924B-2696AF99C34B}.Release|x86.Build.0 = Release|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|x64.ActiveCfg = Debug|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|x64.Build.0 = Debug|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|x86.ActiveCfg = Debug|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Debug|x86.Build.0 = Debug|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|Any CPU.Build.0 = Release|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|x64.ActiveCfg = Release|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|x64.Build.0 = Release|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|x86.ActiveCfg = Release|Any CPU - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A}.Release|x86.Build.0 = Release|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|x64.ActiveCfg = Debug|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|x64.Build.0 = Debug|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|x86.ActiveCfg = Debug|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Debug|x86.Build.0 = Debug|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|Any CPU.Build.0 = Release|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|x64.ActiveCfg = Release|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|x64.Build.0 = Release|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|x86.ActiveCfg = Release|Any CPU - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41}.Release|x86.Build.0 = Release|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|x64.ActiveCfg = Debug|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|x64.Build.0 = Debug|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|x86.ActiveCfg = Debug|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Debug|x86.Build.0 = Debug|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|Any CPU.Build.0 = Release|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|x64.ActiveCfg = Release|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|x64.Build.0 = Release|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|x86.ActiveCfg = Release|Any CPU - {63E0CB97-9992-4564-AB67-EF0122FDD93A}.Release|x86.Build.0 = Release|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|x64.ActiveCfg = Debug|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|x64.Build.0 = Debug|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|x86.ActiveCfg = Debug|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Debug|x86.Build.0 = Debug|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Release|Any CPU.Build.0 = Release|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Release|x64.ActiveCfg = Release|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Release|x64.Build.0 = Release|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Release|x86.ActiveCfg = Release|Any CPU - {3E91BC07-5930-4614-A19C-62077EF74574}.Release|x86.Build.0 = Release|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|x64.ActiveCfg = Debug|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|x64.Build.0 = Debug|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|x86.ActiveCfg = Debug|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Debug|x86.Build.0 = Debug|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|Any CPU.Build.0 = Release|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|x64.ActiveCfg = Release|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|x64.Build.0 = Release|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|x86.ActiveCfg = Release|Any CPU - {E9C13855-BB94-4A28-8FBA-27484F74F100}.Release|x86.Build.0 = Release|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|x64.ActiveCfg = Debug|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|x64.Build.0 = Debug|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|x86.ActiveCfg = Debug|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Debug|x86.Build.0 = Debug|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|Any CPU.Build.0 = Release|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|x64.ActiveCfg = Release|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|x64.Build.0 = Release|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|x86.ActiveCfg = Release|Any CPU - {8C2DFD1D-5BBD-4224-BD54-832127892943}.Release|x86.Build.0 = Release|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|x64.ActiveCfg = Debug|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|x64.Build.0 = Debug|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|x86.ActiveCfg = Debug|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Debug|x86.Build.0 = Debug|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|Any CPU.Build.0 = Release|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|x64.ActiveCfg = Release|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|x64.Build.0 = Release|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|x86.ActiveCfg = Release|Any CPU - {87F29291-B977-4B1B-A7B9-8B3F74CAB081}.Release|x86.Build.0 = Release|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|x64.ActiveCfg = Debug|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|x64.Build.0 = Debug|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|x86.ActiveCfg = Debug|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Debug|x86.Build.0 = Debug|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|Any CPU.Build.0 = Release|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|x64.ActiveCfg = Release|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|x64.Build.0 = Release|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|x86.ActiveCfg = Release|Any CPU - {08A09391-C518-4ACC-97BE-6A64070599AC}.Release|x86.Build.0 = Release|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|x64.ActiveCfg = Debug|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|x64.Build.0 = Debug|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|x86.ActiveCfg = Debug|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Debug|x86.Build.0 = Debug|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|Any CPU.Build.0 = Release|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|x64.ActiveCfg = Release|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|x64.Build.0 = Release|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|x86.ActiveCfg = Release|Any CPU - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4}.Release|x86.Build.0 = Release|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|x64.ActiveCfg = Debug|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|x64.Build.0 = Debug|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|x86.ActiveCfg = Debug|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Debug|x86.Build.0 = Debug|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|Any CPU.Build.0 = Release|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|x64.ActiveCfg = Release|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|x64.Build.0 = Release|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|x86.ActiveCfg = Release|Any CPU - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5}.Release|x86.Build.0 = Release|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|x64.ActiveCfg = Debug|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|x64.Build.0 = Debug|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|x86.ActiveCfg = Debug|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Debug|x86.Build.0 = Debug|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|Any CPU.Build.0 = Release|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|x64.ActiveCfg = Release|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|x64.Build.0 = Release|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|x86.ActiveCfg = Release|Any CPU - {92FDB538-5287-4A94-9262-C5D935300FA7}.Release|x86.Build.0 = Release|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|x64.ActiveCfg = Debug|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|x64.Build.0 = Debug|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|x86.ActiveCfg = Debug|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Debug|x86.Build.0 = Debug|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|Any CPU.Build.0 = Release|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|x64.ActiveCfg = Release|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|x64.Build.0 = Release|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|x86.ActiveCfg = Release|Any CPU - {416B3E62-5539-4715-AF78-68F003B2D4C5}.Release|x86.Build.0 = Release|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|x64.ActiveCfg = Debug|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|x64.Build.0 = Debug|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|x86.ActiveCfg = Debug|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Debug|x86.Build.0 = Debug|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|Any CPU.Build.0 = Release|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|x64.ActiveCfg = Release|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|x64.Build.0 = Release|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|x86.ActiveCfg = Release|Any CPU - {8A79EE3B-995B-4D31-86FA-924BA25ACD26}.Release|x86.Build.0 = Release|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|x64.ActiveCfg = Debug|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|x64.Build.0 = Debug|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|x86.ActiveCfg = Debug|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Debug|x86.Build.0 = Debug|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|Any CPU.Build.0 = Release|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|x64.ActiveCfg = Release|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|x64.Build.0 = Release|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|x86.ActiveCfg = Release|Any CPU - {F7039174-4368-4686-B9C6-69E89A7B8588}.Release|x86.Build.0 = Release|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|x64.ActiveCfg = Debug|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|x64.Build.0 = Debug|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|x86.ActiveCfg = Debug|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Debug|x86.Build.0 = Debug|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|Any CPU.Build.0 = Release|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|x64.ActiveCfg = Release|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|x64.Build.0 = Release|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|x86.ActiveCfg = Release|Any CPU - {4A26A4AE-8688-41E8-8996-BAA22157A982}.Release|x86.Build.0 = Release|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Debug|x64.ActiveCfg = Debug|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Debug|x64.Build.0 = Debug|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Debug|x86.ActiveCfg = Debug|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Debug|x86.Build.0 = Debug|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Release|Any CPU.Build.0 = Release|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Release|x64.ActiveCfg = Release|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Release|x64.Build.0 = Release|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Release|x86.ActiveCfg = Release|Any CPU - {F1D10473-3132-4030-86FB-93344923EF34}.Release|x86.Build.0 = Release|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|x64.ActiveCfg = Debug|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|x64.Build.0 = Debug|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|x86.ActiveCfg = Debug|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Debug|x86.Build.0 = Debug|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|Any CPU.Build.0 = Release|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|x64.ActiveCfg = Release|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|x64.Build.0 = Release|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|x86.ActiveCfg = Release|Any CPU - {A2279F48-5A05-424D-90ED-822E13B9725E}.Release|x86.Build.0 = Release|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|x64.ActiveCfg = Debug|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|x64.Build.0 = Debug|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|x86.ActiveCfg = Debug|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Debug|x86.Build.0 = Debug|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|Any CPU.Build.0 = Release|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|x64.ActiveCfg = Release|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|x64.Build.0 = Release|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|x86.ActiveCfg = Release|Any CPU - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4}.Release|x86.Build.0 = Release|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|x64.ActiveCfg = Debug|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|x64.Build.0 = Debug|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|x86.ActiveCfg = Debug|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Debug|x86.Build.0 = Debug|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|Any CPU.Build.0 = Release|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|x64.ActiveCfg = Release|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|x64.Build.0 = Release|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|x86.ActiveCfg = Release|Any CPU - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63}.Release|x86.Build.0 = Release|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|x64.ActiveCfg = Debug|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|x64.Build.0 = Debug|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|x86.ActiveCfg = Debug|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Debug|x86.Build.0 = Debug|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|Any CPU.Build.0 = Release|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|x64.ActiveCfg = Release|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|x64.Build.0 = Release|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|x86.ActiveCfg = Release|Any CPU - {46DB470A-4AC1-4C01-A638-395151DF6369}.Release|x86.Build.0 = Release|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|x64.ActiveCfg = Debug|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|x64.Build.0 = Debug|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|x86.ActiveCfg = Debug|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Debug|x86.Build.0 = Debug|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|Any CPU.Build.0 = Release|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|x64.ActiveCfg = Release|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|x64.Build.0 = Release|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|x86.ActiveCfg = Release|Any CPU - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E}.Release|x86.Build.0 = Release|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|x64.ActiveCfg = Debug|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|x64.Build.0 = Debug|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|x86.ActiveCfg = Debug|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Debug|x86.Build.0 = Debug|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|Any CPU.Build.0 = Release|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|x64.ActiveCfg = Release|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|x64.Build.0 = Release|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|x86.ActiveCfg = Release|Any CPU - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7}.Release|x86.Build.0 = Release|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|x64.ActiveCfg = Debug|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|x64.Build.0 = Debug|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|x86.ActiveCfg = Debug|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Debug|x86.Build.0 = Debug|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|Any CPU.Build.0 = Release|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|x64.ActiveCfg = Release|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|x64.Build.0 = Release|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|x86.ActiveCfg = Release|Any CPU - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56}.Release|x86.Build.0 = Release|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|x64.ActiveCfg = Debug|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|x64.Build.0 = Debug|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|x86.ActiveCfg = Debug|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Debug|x86.Build.0 = Debug|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|Any CPU.Build.0 = Release|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|x64.ActiveCfg = Release|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|x64.Build.0 = Release|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|x86.ActiveCfg = Release|Any CPU - {4D26E405-1C9D-4FA4-9F28-C608E5C82992}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {C4104E84-CB85-49E3-BBC0-B765CB305788} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {3BB08B4D-D000-4EC6-BC1F-35ED347390C1} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {77E1AFB2-C7F2-407A-A72F-D4BBB50F57C7} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {F769B6CA-7E95-4067-A089-124D8C2944A1} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {10A7B212-4571-40C4-AE10-E07F8B1B9F5C} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {EB37060F-206D-4CC1-9A0C-9713CC624A8B} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {FD8E9FE1-8275-4834-92CD-CCBB8EBC8A00} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {F1565B13-DC4D-48CD-B8CD-7DB5772A44B2} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {C76A75DA-21D0-42D4-ADA7-B367829F0963} = {D08D46D8-9703-48C1-BFBA-3026FDF8B03A} - {4F129D0D-A12B-43CA-96AB-8C02C31863D1} = {C76A75DA-21D0-42D4-ADA7-B367829F0963} - {05005187-7F69-476B-924B-2696AF99C34B} = {C76A75DA-21D0-42D4-ADA7-B367829F0963} - {D01A8193-EBF7-4EDB-B6EB-1DC16EA3A85A} = {D08D46D8-9703-48C1-BFBA-3026FDF8B03A} - {BAD15CD8-54DC-4060-A0D1-2DD890F65A41} = {55754A06-7449-48BE-AE8B-BD8CF2AB2E21} - {63E0CB97-9992-4564-AB67-EF0122FDD93A} = {55754A06-7449-48BE-AE8B-BD8CF2AB2E21} - {3E91BC07-5930-4614-A19C-62077EF74574} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} - {5AB3E84F-F8BD-4F60-874F-4CFCC9B5335E} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} - {E9C13855-BB94-4A28-8FBA-27484F74F100} = {5AB3E84F-F8BD-4F60-874F-4CFCC9B5335E} - {8C2DFD1D-5BBD-4224-BD54-832127892943} = {5AB3E84F-F8BD-4F60-874F-4CFCC9B5335E} - {87F29291-B977-4B1B-A7B9-8B3F74CAB081} = {5AB3E84F-F8BD-4F60-874F-4CFCC9B5335E} - {58C2C86F-BB43-4A98-8F7C-F3ECF3B72E2F} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} - {08A09391-C518-4ACC-97BE-6A64070599AC} = {58C2C86F-BB43-4A98-8F7C-F3ECF3B72E2F} - {8280AD8D-CAA4-4C0F-99C0-CE7BA02FBDB4} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} - {F7A90CB1-A90D-4EDB-A48D-F3016E9447E5} = {58C2C86F-BB43-4A98-8F7C-F3ECF3B72E2F} - {92FDB538-5287-4A94-9262-C5D935300FA7} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} - {9F3C759D-918D-49D9-8B4C-15AD8D02253B} = {0C3E849E-4AD6-4B06-8A7C-DDBE96231E8F} - {416B3E62-5539-4715-AF78-68F003B2D4C5} = {9F3C759D-918D-49D9-8B4C-15AD8D02253B} - {8A79EE3B-995B-4D31-86FA-924BA25ACD26} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {F7039174-4368-4686-B9C6-69E89A7B8588} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {4A26A4AE-8688-41E8-8996-BAA22157A982} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {F1D10473-3132-4030-86FB-93344923EF34} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {A2279F48-5A05-424D-90ED-822E13B9725E} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {2695DD01-BF77-4107-8A9E-CAEB17A2A7D4} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {AB29DA92-CC87-48DD-9FB7-60B6785B8A63} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {46DB470A-4AC1-4C01-A638-395151DF6369} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {280E05C3-B3AE-4D50-A3CB-00A8647BFC6E} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {4D13F98D-9AA6-431A-B089-68A05D0CE5C7} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {D88BF8F6-7B68-41B2-854B-DAEA7B3A1D56} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - {4D26E405-1C9D-4FA4-9F28-C608E5C82992} = {C746D1C5-2031-486F-8C83-F89DFE1D6A3E} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {21D598B0-2383-4B22-826D-E7FB4921BD66} - EndGlobalSection -EndGlobal diff --git a/src/Identity/Identity/README.md b/src/Identity/README.md similarity index 100% rename from src/Identity/Identity/README.md rename to src/Identity/README.md diff --git a/src/Identity/Identity/Specification.Tests/src/IdentityResultAssert.cs b/src/Identity/Specification.Tests/src/IdentityResultAssert.cs similarity index 100% rename from src/Identity/Identity/Specification.Tests/src/IdentityResultAssert.cs rename to src/Identity/Specification.Tests/src/IdentityResultAssert.cs diff --git a/src/Identity/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs b/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs similarity index 100% rename from src/Identity/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs rename to src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs diff --git a/src/Identity/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj similarity index 100% rename from src/Identity/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj rename to src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj diff --git a/src/Identity/Identity/Specification.Tests/src/TestLogger.cs b/src/Identity/Specification.Tests/src/TestLogger.cs similarity index 100% rename from src/Identity/Identity/Specification.Tests/src/TestLogger.cs rename to src/Identity/Specification.Tests/src/TestLogger.cs diff --git a/src/Identity/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs similarity index 100% rename from src/Identity/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs rename to src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs diff --git a/src/Identity/Identity/Specification.Tests/src/baseline.netcore.json b/src/Identity/Specification.Tests/src/baseline.netcore.json similarity index 100% rename from src/Identity/Identity/Specification.Tests/src/baseline.netcore.json rename to src/Identity/Specification.Tests/src/baseline.netcore.json diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Filters/ExternalLoginsPageFilter.cs b/src/Identity/UI/src/Areas/Identity/Filters/ExternalLoginsPageFilter.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Filters/ExternalLoginsPageFilter.cs rename to src/Identity/UI/src/Areas/Identity/Filters/ExternalLoginsPageFilter.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Lockout.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Login.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Logout.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_Layout.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_Layout.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_Layout.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/Register.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Account/_ViewImports.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Account/_ViewImports.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Account/_ViewImports.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Error.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/Error.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Error.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/Error.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/Error.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/Error.cshtml.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/Error.cshtml.cs rename to src/Identity/UI/src/Areas/Identity/Pages/Error.cshtml.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/_Layout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/_Layout.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/_Layout.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/_Layout.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/_ViewImports.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/_ViewImports.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/_ViewImports.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Pages/_ViewStart.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/_ViewStart.cshtml similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Pages/_ViewStart.cshtml rename to src/Identity/UI/src/Areas/Identity/Pages/_ViewStart.cshtml diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Services/EmailSender.cs b/src/Identity/UI/src/Areas/Identity/Services/EmailSender.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Services/EmailSender.cs rename to src/Identity/UI/src/Areas/Identity/Services/EmailSender.cs diff --git a/src/Identity/Identity/UI/src/Areas/Identity/Services/IEmailSender.cs b/src/Identity/UI/src/Areas/Identity/Services/IEmailSender.cs similarity index 100% rename from src/Identity/Identity/UI/src/Areas/Identity/Services/IEmailSender.cs rename to src/Identity/UI/src/Areas/Identity/Services/IEmailSender.cs diff --git a/src/Identity/Identity/UI/src/IdentityBuilderUIExtensions.cs b/src/Identity/UI/src/IdentityBuilderUIExtensions.cs similarity index 100% rename from src/Identity/Identity/UI/src/IdentityBuilderUIExtensions.cs rename to src/Identity/UI/src/IdentityBuilderUIExtensions.cs diff --git a/src/Identity/Identity/UI/src/IdentityDefaultUIAttribute.cs b/src/Identity/UI/src/IdentityDefaultUIAttribute.cs similarity index 100% rename from src/Identity/Identity/UI/src/IdentityDefaultUIAttribute.cs rename to src/Identity/UI/src/IdentityDefaultUIAttribute.cs diff --git a/src/Identity/Identity/UI/src/IdentityDefaultUIConfigureOptions.cs b/src/Identity/UI/src/IdentityDefaultUIConfigureOptions.cs similarity index 100% rename from src/Identity/Identity/UI/src/IdentityDefaultUIConfigureOptions.cs rename to src/Identity/UI/src/IdentityDefaultUIConfigureOptions.cs diff --git a/src/Identity/Identity/UI/src/IdentityPageModelConvention.cs b/src/Identity/UI/src/IdentityPageModelConvention.cs similarity index 100% rename from src/Identity/Identity/UI/src/IdentityPageModelConvention.cs rename to src/Identity/UI/src/IdentityPageModelConvention.cs diff --git a/src/Identity/Identity/UI/src/IdentityServiceCollectionUIExtensions.cs b/src/Identity/UI/src/IdentityServiceCollectionUIExtensions.cs similarity index 100% rename from src/Identity/Identity/UI/src/IdentityServiceCollectionUIExtensions.cs rename to src/Identity/UI/src/IdentityServiceCollectionUIExtensions.cs diff --git a/src/Identity/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj similarity index 100% rename from src/Identity/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj rename to src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj diff --git a/src/Identity/Identity/UI/src/THIRD-PARTY-NOTICES b/src/Identity/UI/src/THIRD-PARTY-NOTICES similarity index 100% rename from src/Identity/Identity/UI/src/THIRD-PARTY-NOTICES rename to src/Identity/UI/src/THIRD-PARTY-NOTICES diff --git a/src/Identity/Identity/UI/src/baseline.netcore.json b/src/Identity/UI/src/baseline.netcore.json similarity index 100% rename from src/Identity/Identity/UI/src/baseline.netcore.json rename to src/Identity/UI/src/baseline.netcore.json diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/css/site.css b/src/Identity/UI/src/wwwroot/Identity/css/site.css similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/css/site.css rename to src/Identity/UI/src/wwwroot/Identity/css/site.css diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/css/site.min.css b/src/Identity/UI/src/wwwroot/Identity/css/site.min.css similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/css/site.min.css rename to src/Identity/UI/src/wwwroot/Identity/css/site.min.css diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/js/site.js b/src/Identity/UI/src/wwwroot/Identity/js/site.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/js/site.js rename to src/Identity/UI/src/wwwroot/Identity/js/site.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/js/site.min.js b/src/Identity/UI/src/wwwroot/Identity/js/site.min.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/js/site.min.js rename to src/Identity/UI/src/wwwroot/Identity/js/site.min.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/.bower.json b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/.bower.json similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/.bower.json rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/.bower.json diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/LICENSE b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/LICENSE similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/LICENSE rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/LICENSE diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.css.map diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap-theme.min.css.map diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/npm.js b/src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/npm.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/npm.js rename to src/Identity/UI/src/wwwroot/Identity/lib/bootstrap/dist/js/npm.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json b/src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/.bower.json diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt b/src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/LICENSE.txt diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/.bower.json b/src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/.bower.json similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/.bower.json rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/.bower.json diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/LICENSE.md b/src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/LICENSE.md similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/LICENSE.md rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/LICENSE.md diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js b/src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js b/src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/additional-methods.min.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js b/src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js b/src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery-validation/dist/jquery.validate.min.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/.bower.json b/src/Identity/UI/src/wwwroot/Identity/lib/jquery/.bower.json similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/.bower.json rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery/.bower.json diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/LICENSE.txt b/src/Identity/UI/src/wwwroot/Identity/lib/jquery/LICENSE.txt similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/LICENSE.txt rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery/LICENSE.txt diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.js b/src/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.js rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.js b/src/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.js similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.js rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.js diff --git a/src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.map b/src/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.map similarity index 100% rename from src/Identity/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.map rename to src/Identity/UI/src/wwwroot/Identity/lib/jquery/dist/jquery.min.map diff --git a/src/Identity/build.cmd b/src/Identity/build.cmd new file mode 100644 index 0000000000..f22573197f --- /dev/null +++ b/src/Identity/build.cmd @@ -0,0 +1,3 @@ +@ECHO OFF +SET RepoRoot=%~dp0..\.. +%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -projects %~dp0**\*.*proj %* diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml rename to src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml rename to src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml rename to src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewStart.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewStart.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewStart.cshtml rename to src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewStart.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Controllers/HomeController.cs b/src/Identity/samples/IdentitySample.DefaultUI/Controllers/HomeController.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Controllers/HomeController.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Controllers/HomeController.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationDbContext.cs b/src/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationDbContext.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationDbContext.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationDbContext.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationUser.cs b/src/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationUser.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationUser.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Data/ApplicationUser.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs b/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs b/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj b/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj rename to src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Program.cs b/src/Identity/samples/IdentitySample.DefaultUI/Program.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Program.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Program.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Startup.cs b/src/Identity/samples/IdentitySample.DefaultUI/Startup.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Startup.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Startup.cs diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Home/Index.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Views/Home/Index.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Home/Index.cshtml rename to src/Identity/samples/IdentitySample.DefaultUI/Views/Home/Index.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml rename to src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml rename to src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml rename to src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml rename to src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/_ViewStart.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewStart.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/Views/_ViewStart.cshtml rename to src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewStart.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/appsettings.json b/src/Identity/samples/IdentitySample.DefaultUI/appsettings.json similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/appsettings.json rename to src/Identity/samples/IdentitySample.DefaultUI/appsettings.json diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/web.Debug.config b/src/Identity/samples/IdentitySample.DefaultUI/web.Debug.config similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/web.Debug.config rename to src/Identity/samples/IdentitySample.DefaultUI/web.Debug.config diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/web.Release.config b/src/Identity/samples/IdentitySample.DefaultUI/web.Release.config similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/web.Release.config rename to src/Identity/samples/IdentitySample.DefaultUI/web.Release.config diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/web.config b/src/Identity/samples/IdentitySample.DefaultUI/web.config similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/web.config rename to src/Identity/samples/IdentitySample.DefaultUI/web.config diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.css b/src/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.css similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.css rename to src/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.css diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.min.css b/src/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.min.css similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.min.css rename to src/Identity/samples/IdentitySample.DefaultUI/wwwroot/css/site.min.css diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/favicon.ico b/src/Identity/samples/IdentitySample.DefaultUI/wwwroot/favicon.ico similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/favicon.ico rename to src/Identity/samples/IdentitySample.DefaultUI/wwwroot/favicon.ico diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.js b/src/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.js similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.js rename to src/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.js diff --git a/src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.min.js b/src/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.min.js similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.min.js rename to src/Identity/samples/IdentitySample.DefaultUI/wwwroot/js/site.min.js diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/AccountController.cs b/src/Identity/samples/IdentitySample.Mvc/Controllers/AccountController.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/AccountController.cs rename to src/Identity/samples/IdentitySample.Mvc/Controllers/AccountController.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/HomeController.cs b/src/Identity/samples/IdentitySample.Mvc/Controllers/HomeController.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/HomeController.cs rename to src/Identity/samples/IdentitySample.Mvc/Controllers/HomeController.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/ManageController.cs b/src/Identity/samples/IdentitySample.Mvc/Controllers/ManageController.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Controllers/ManageController.cs rename to src/Identity/samples/IdentitySample.Mvc/Controllers/ManageController.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd b/src/Identity/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd rename to src/Identity/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to src/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to src/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to src/Identity/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj rename to src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/MessageServices.cs b/src/Identity/samples/IdentitySample.Mvc/MessageServices.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/MessageServices.cs rename to src/Identity/samples/IdentitySample.Mvc/MessageServices.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/LoginViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/LoginViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/LoginViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/LoginViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/RegisterViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/RegisterViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/RegisterViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/RegisterViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ResetPasswordViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ResetPasswordViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ResetPasswordViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/ResetPasswordViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/UseRecoveryCodeViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/UseRecoveryCodeViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/UseRecoveryCodeViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/UseRecoveryCodeViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyAuthenticatorCodeViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyAuthenticatorCodeViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyAuthenticatorCodeViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyAuthenticatorCodeViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyCodeViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyCodeViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyCodeViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels/VerifyCodeViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ApplicationUser.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ApplicationUser.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ApplicationUser.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ApplicationUser.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/AddPhoneNumberViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/AddPhoneNumberViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/AddPhoneNumberViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ChangePasswordViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ChangePasswordViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ChangePasswordViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ChangePasswordViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/DisplayRecoveryCodesViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/DisplayRecoveryCodesViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/DisplayRecoveryCodesViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/DisplayRecoveryCodesViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/FactorViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/FactorViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/FactorViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/FactorViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/RemoveLoginViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/RemoveLoginViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/RemoveLoginViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/RemoveLoginViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/SetPasswordViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/SetPasswordViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/SetPasswordViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/SetPasswordViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs rename to src/Identity/samples/IdentitySample.Mvc/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Program.cs b/src/Identity/samples/IdentitySample.Mvc/Program.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Program.cs rename to src/Identity/samples/IdentitySample.Mvc/Program.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Services/IEmailSender.cs b/src/Identity/samples/IdentitySample.Mvc/Services/IEmailSender.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Services/IEmailSender.cs rename to src/Identity/samples/IdentitySample.Mvc/Services/IEmailSender.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Services/ISmsSender.cs b/src/Identity/samples/IdentitySample.Mvc/Services/ISmsSender.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Services/ISmsSender.cs rename to src/Identity/samples/IdentitySample.Mvc/Services/ISmsSender.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Services/MessageServices.cs b/src/Identity/samples/IdentitySample.Mvc/Services/MessageServices.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Services/MessageServices.cs rename to src/Identity/samples/IdentitySample.Mvc/Services/MessageServices.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Startup.cs b/src/Identity/samples/IdentitySample.Mvc/Startup.cs similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Startup.cs rename to src/Identity/samples/IdentitySample.Mvc/Startup.cs diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/ConfirmEmail.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginConfirmation.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/ExternalLoginFailure.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPassword.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/ForgotPasswordConfirmation.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Lockout.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/Lockout.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Lockout.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/Lockout.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Register.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/Register.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/Register.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/Register.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPassword.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPasswordConfirmation.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPasswordConfirmation.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPasswordConfirmation.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/ResetPasswordConfirmation.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/SendCode.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/UseRecoveryCode.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyAuthenticatorCode.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Account/VerifyCode.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Home/Index.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Home/Index.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Home/Index.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Home/Index.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Manage/AddPhoneNumber.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Manage/ChangePassword.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Manage/Index.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/SetPassword.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Manage/SetPassword.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/SetPassword.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Manage/SetPassword.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Manage/VerifyPhoneNumber.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/Views/_ViewStart.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/_ViewStart.cshtml similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/Views/_ViewStart.cshtml rename to src/Identity/samples/IdentitySample.Mvc/Views/_ViewStart.cshtml diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/appsettings.json b/src/Identity/samples/IdentitySample.Mvc/appsettings.json similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/appsettings.json rename to src/Identity/samples/IdentitySample.Mvc/appsettings.json diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/web.Debug.config b/src/Identity/samples/IdentitySample.Mvc/web.Debug.config similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/web.Debug.config rename to src/Identity/samples/IdentitySample.Mvc/web.Debug.config diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/web.Release.config b/src/Identity/samples/IdentitySample.Mvc/web.Release.config similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/web.Release.config rename to src/Identity/samples/IdentitySample.Mvc/web.Release.config diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/web.config b/src/Identity/samples/IdentitySample.Mvc/web.config similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/web.config rename to src/Identity/samples/IdentitySample.Mvc/web.config diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/css/site.css b/src/Identity/samples/IdentitySample.Mvc/wwwroot/css/site.css similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/css/site.css rename to src/Identity/samples/IdentitySample.Mvc/wwwroot/css/site.css diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/favicon.ico b/src/Identity/samples/IdentitySample.Mvc/wwwroot/favicon.ico similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/favicon.ico rename to src/Identity/samples/IdentitySample.Mvc/wwwroot/favicon.ico diff --git a/src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/js/site.js b/src/Identity/samples/IdentitySample.Mvc/wwwroot/js/site.js similarity index 100% rename from src/Identity/Identity/samples/IdentitySample.Mvc/wwwroot/js/site.js rename to src/Identity/samples/IdentitySample.Mvc/wwwroot/js/site.js diff --git a/src/Identity/Identity/samples/NativeWPFClient/App.config b/src/Identity/samples/NativeWPFClient/App.config similarity index 100% rename from src/Identity/Identity/samples/NativeWPFClient/App.config rename to src/Identity/samples/NativeWPFClient/App.config diff --git a/src/Identity/Identity/samples/NativeWPFClient/App.xaml b/src/Identity/samples/NativeWPFClient/App.xaml similarity index 100% rename from src/Identity/Identity/samples/NativeWPFClient/App.xaml rename to src/Identity/samples/NativeWPFClient/App.xaml diff --git a/src/Identity/Identity/samples/NativeWPFClient/App.xaml.cs b/src/Identity/samples/NativeWPFClient/App.xaml.cs similarity index 100% rename from src/Identity/Identity/samples/NativeWPFClient/App.xaml.cs rename to src/Identity/samples/NativeWPFClient/App.xaml.cs diff --git a/src/Identity/Identity/samples/NativeWPFClient/MainWindow.xaml b/src/Identity/samples/NativeWPFClient/MainWindow.xaml similarity index 100% rename from src/Identity/Identity/samples/NativeWPFClient/MainWindow.xaml rename to src/Identity/samples/NativeWPFClient/MainWindow.xaml diff --git a/src/Identity/Identity/samples/NativeWPFClient/MainWindow.xaml.cs b/src/Identity/samples/NativeWPFClient/MainWindow.xaml.cs similarity index 100% rename from src/Identity/Identity/samples/NativeWPFClient/MainWindow.xaml.cs rename to src/Identity/samples/NativeWPFClient/MainWindow.xaml.cs diff --git a/src/Identity/Identity/samples/NativeWPFClient/NativeWPFClient.csproj b/src/Identity/samples/NativeWPFClient/NativeWPFClient.csproj similarity index 98% rename from src/Identity/Identity/samples/NativeWPFClient/NativeWPFClient.csproj rename to src/Identity/samples/NativeWPFClient/NativeWPFClient.csproj index cfdc468083..9eae188a2f 100644 --- a/src/Identity/Identity/samples/NativeWPFClient/NativeWPFClient.csproj +++ b/src/Identity/samples/NativeWPFClient/NativeWPFClient.csproj @@ -15,6 +15,7 @@ 4 true + false $(BaseNuGetRuntimeIdentifier) @@ -104,4 +105,5 @@ - \ No newline at end of file + + diff --git a/src/Identity/Identity/samples/NativeWPFClient/Properties/AssemblyInfo.cs b/src/Identity/samples/NativeWPFClient/Properties/AssemblyInfo.cs similarity index 100% rename from src/Identity/Identity/samples/NativeWPFClient/Properties/AssemblyInfo.cs rename to src/Identity/samples/NativeWPFClient/Properties/AssemblyInfo.cs diff --git a/src/Identity/Identity/samples/NativeWPFClient/Properties/Resources.Designer.cs b/src/Identity/samples/NativeWPFClient/Properties/Resources.Designer.cs similarity index 100% rename from src/Identity/Identity/samples/NativeWPFClient/Properties/Resources.Designer.cs rename to src/Identity/samples/NativeWPFClient/Properties/Resources.Designer.cs diff --git a/src/Identity/Identity/samples/NativeWPFClient/Properties/Resources.resx b/src/Identity/samples/NativeWPFClient/Properties/Resources.resx similarity index 100% rename from src/Identity/Identity/samples/NativeWPFClient/Properties/Resources.resx rename to src/Identity/samples/NativeWPFClient/Properties/Resources.resx diff --git a/src/Identity/Identity/samples/NativeWPFClient/Properties/Settings.Designer.cs b/src/Identity/samples/NativeWPFClient/Properties/Settings.Designer.cs similarity index 100% rename from src/Identity/Identity/samples/NativeWPFClient/Properties/Settings.Designer.cs rename to src/Identity/samples/NativeWPFClient/Properties/Settings.Designer.cs diff --git a/src/Identity/Identity/samples/NativeWPFClient/Properties/Settings.settings b/src/Identity/samples/NativeWPFClient/Properties/Settings.settings similarity index 100% rename from src/Identity/Identity/samples/NativeWPFClient/Properties/Settings.settings rename to src/Identity/samples/NativeWPFClient/Properties/Settings.settings diff --git a/src/Identity/startvs.cmd b/src/Identity/startvs.cmd new file mode 100644 index 0000000000..7dfe1fc0ff --- /dev/null +++ b/src/Identity/startvs.cmd @@ -0,0 +1,3 @@ +@ECHO OFF + +%~dp0..\..\startvs.cmd %~dp0Identity.sln diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserAuthorizationTests.cs b/src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserAuthorizationTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserAuthorizationTests.cs rename to src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserAuthorizationTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserLoginTests.cs b/src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserLoginTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserLoginTests.cs rename to src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserLoginTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserManagementTests.cs b/src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserManagementTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserManagementTests.cs rename to src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserManagementTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserRegistrationTests.cs b/src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserRegistrationTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserRegistrationTests.cs rename to src/Identity/test/Identity.FunctionalTests/ApplicationUserTests/ApplicationUserRegistrationTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs b/src/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs rename to src/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Extensions/HtmlAssert.cs b/src/Identity/test/Identity.FunctionalTests/Extensions/HtmlAssert.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Extensions/HtmlAssert.cs rename to src/Identity/test/Identity.FunctionalTests/Extensions/HtmlAssert.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Extensions/HttpClientExtensions.cs b/src/Identity/test/Identity.FunctionalTests/Extensions/HttpClientExtensions.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Extensions/HttpClientExtensions.cs rename to src/Identity/test/Identity.FunctionalTests/Extensions/HttpClientExtensions.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Extensions/ResponseAssert.cs b/src/Identity/test/Identity.FunctionalTests/Extensions/ResponseAssert.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Extensions/ResponseAssert.cs rename to src/Identity/test/Identity.FunctionalTests/Extensions/ResponseAssert.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserAuthorizationTests.cs b/src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserAuthorizationTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserAuthorizationTests.cs rename to src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserAuthorizationTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserLoginTests.cs b/src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserLoginTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserLoginTests.cs rename to src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserLoginTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserManagementTests.cs b/src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserManagementTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserManagementTests.cs rename to src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserManagementTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserRegistrationTests.cs b/src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserRegistrationTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserRegistrationTests.cs rename to src/Identity/test/Identity.FunctionalTests/IdentityUserTests/IdentityUserRegistrationTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs rename to src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIPage.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIPage.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIPage.cs rename to src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIPage.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs rename to src/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPage.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPage.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPage.cs rename to src/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPage.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPageContext.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPageContext.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPageContext.cs rename to src/Identity/test/Identity.FunctionalTests/Infrastructure/HtmlPageContext.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs rename to src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/LoginTests.cs b/src/Identity/test/Identity.FunctionalTests/LoginTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/LoginTests.cs rename to src/Identity/test/Identity.FunctionalTests/LoginTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/ManagementTests.cs b/src/Identity/test/Identity.FunctionalTests/ManagementTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/ManagementTests.cs rename to src/Identity/test/Identity.FunctionalTests/ManagementTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj similarity index 56% rename from src/Identity/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj rename to src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index 3cb4e12dd6..2ff45704c8 100644 --- a/src/Identity/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -3,11 +3,14 @@ $(StandardTestTfms) + + + true - - + + @@ -23,5 +26,6 @@ - - \ No newline at end of file + + + diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs b/src/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs rename to src/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ConfirmEmail.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/ConfirmEmail.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ConfirmEmail.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/ConfirmEmail.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPassword.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPassword.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPassword.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPassword.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPasswordConfirmation.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPasswordConfirmation.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPasswordConfirmation.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/ForgotPasswordConfirmation.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWith2fa.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWith2fa.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWith2fa.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWith2fa.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWithRecoveryCode.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWithRecoveryCode.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWithRecoveryCode.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/LoginWithRecoveryCode.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ChangePassword.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ChangePassword.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ChangePassword.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ChangePassword.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/DeleteUser.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/DeleteUser.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/DeleteUser.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/DeleteUser.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/EnableAuthenticator.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/EnableAuthenticator.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/EnableAuthenticator.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/EnableAuthenticator.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/LinkExternalLogin.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/LinkExternalLogin.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/LinkExternalLogin.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/LinkExternalLogin.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ManageExternalLogin.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ManageExternalLogin.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ManageExternalLogin.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ManageExternalLogin.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/PersonalData.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/PersonalData.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/PersonalData.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/PersonalData.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/RemoveExternalLogin.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/RemoveExternalLogin.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/RemoveExternalLogin.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/RemoveExternalLogin.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ResetAuthenticator.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ResetAuthenticator.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ResetAuthenticator.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ResetAuthenticator.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/SetPassword.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/SetPassword.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/SetPassword.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/SetPassword.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ShowRecoveryCodes.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ShowRecoveryCodes.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ShowRecoveryCodes.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/ShowRecoveryCodes.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/TwoFactorAuthentication.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/TwoFactorAuthentication.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/TwoFactorAuthentication.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/TwoFactorAuthentication.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPassword.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPassword.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPassword.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPassword.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPasswordConfirmation.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPasswordConfirmation.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPasswordConfirmation.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Account/ResetPasswordConfirmation.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Contoso/Login.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Contoso/Login.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Contoso/Login.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Contoso/Login.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/Pages/Index.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Index.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/Pages/Index.cs rename to src/Identity/test/Identity.FunctionalTests/Pages/Index.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserAuthorizationTests.cs b/src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserAuthorizationTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserAuthorizationTests.cs rename to src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserAuthorizationTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserLoginTests.cs b/src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserLoginTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserLoginTests.cs rename to src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserLoginTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserManagementTests.cs b/src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserManagementTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserManagementTests.cs rename to src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserManagementTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserRegistrationTests.cs b/src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserRegistrationTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserRegistrationTests.cs rename to src/Identity/test/Identity.FunctionalTests/PocoUserTests/PocoUserRegistrationTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/RegistrationTests.cs b/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/RegistrationTests.cs rename to src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/UserStories.cs b/src/Identity/test/Identity.FunctionalTests/UserStories.cs similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/UserStories.cs rename to src/Identity/test/Identity.FunctionalTests/UserStories.cs diff --git a/src/Identity/Identity/test/Identity.FunctionalTests/xunit.runner.json b/src/Identity/test/Identity.FunctionalTests/xunit.runner.json similarity index 100% rename from src/Identity/Identity/test/Identity.FunctionalTests/xunit.runner.json rename to src/Identity/test/Identity.FunctionalTests/xunit.runner.json diff --git a/src/Identity/Identity/test/Identity.Test/ApiConsistencyTest.cs b/src/Identity/test/Identity.Test/ApiConsistencyTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/ApiConsistencyTest.cs rename to src/Identity/test/Identity.Test/ApiConsistencyTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs b/src/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs similarity index 97% rename from src/Identity/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs rename to src/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs index 8b001bd8d7..a2509d52a1 100644 --- a/src/Identity/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs +++ b/src/Identity/test/Identity.Test/CdnScriptTaghelperTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Identity.Test public async Task IdentityUI_ScriptTags_SubresourceIntegrityCheck() { var slnDir = GetSolutionDir(); - var sourceDir = Path.Combine(slnDir, "Identity", "UI"); + var sourceDir = Path.Combine(slnDir, "UI", "src"); var cshtmlFiles = Directory.GetFiles(sourceDir, "*.cshtml", SearchOption.AllDirectories); var scriptTags = new List(); @@ -128,4 +128,4 @@ namespace Microsoft.AspNetCore.Identity.Test return dir.FullName; } } -} \ No newline at end of file +} diff --git a/src/Identity/Identity/test/Identity.Test/IdentityBuilderTest.cs b/src/Identity/test/Identity.Test/IdentityBuilderTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/IdentityBuilderTest.cs rename to src/Identity/test/Identity.Test/IdentityBuilderTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/IdentityOptionsTest.cs b/src/Identity/test/Identity.Test/IdentityOptionsTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/IdentityOptionsTest.cs rename to src/Identity/test/Identity.Test/IdentityOptionsTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/IdentityResultTest.cs b/src/Identity/test/Identity.Test/IdentityResultTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/IdentityResultTest.cs rename to src/Identity/test/Identity.Test/IdentityResultTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj similarity index 90% rename from src/Identity/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj rename to src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj index 3a0ff854c3..7b3cb6a375 100644 --- a/src/Identity/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj +++ b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Identity/Identity/test/Identity.Test/NoopRoleStore.cs b/src/Identity/test/Identity.Test/NoopRoleStore.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/NoopRoleStore.cs rename to src/Identity/test/Identity.Test/NoopRoleStore.cs diff --git a/src/Identity/Identity/test/Identity.Test/NoopUserStore.cs b/src/Identity/test/Identity.Test/NoopUserStore.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/NoopUserStore.cs rename to src/Identity/test/Identity.Test/NoopUserStore.cs diff --git a/src/Identity/Identity/test/Identity.Test/PasswordHasherTest.cs b/src/Identity/test/Identity.Test/PasswordHasherTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/PasswordHasherTest.cs rename to src/Identity/test/Identity.Test/PasswordHasherTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/PasswordValidatorTest.cs b/src/Identity/test/Identity.Test/PasswordValidatorTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/PasswordValidatorTest.cs rename to src/Identity/test/Identity.Test/PasswordValidatorTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/PrincipalExtensionsTest.cs b/src/Identity/test/Identity.Test/PrincipalExtensionsTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/PrincipalExtensionsTest.cs rename to src/Identity/test/Identity.Test/PrincipalExtensionsTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/RoleManagerTest.cs b/src/Identity/test/Identity.Test/RoleManagerTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/RoleManagerTest.cs rename to src/Identity/test/Identity.Test/RoleManagerTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/RoleValidatorTest.cs b/src/Identity/test/Identity.Test/RoleValidatorTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/RoleValidatorTest.cs rename to src/Identity/test/Identity.Test/RoleValidatorTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/SecurityStampValidatorTest.cs b/src/Identity/test/Identity.Test/SecurityStampValidatorTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/SecurityStampValidatorTest.cs rename to src/Identity/test/Identity.Test/SecurityStampValidatorTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/SignInManagerTest.cs b/src/Identity/test/Identity.Test/SignInManagerTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/SignInManagerTest.cs rename to src/Identity/test/Identity.Test/SignInManagerTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs b/src/Identity/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs rename to src/Identity/test/Identity.Test/UserClaimsPrincipalFactoryTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/UserManagerTest.cs b/src/Identity/test/Identity.Test/UserManagerTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/UserManagerTest.cs rename to src/Identity/test/Identity.Test/UserManagerTest.cs diff --git a/src/Identity/Identity/test/Identity.Test/UserValidatorTest.cs b/src/Identity/test/Identity.Test/UserValidatorTest.cs similarity index 100% rename from src/Identity/Identity/test/Identity.Test/UserValidatorTest.cs rename to src/Identity/test/Identity.Test/UserValidatorTest.cs diff --git a/src/Identity/Identity/test/InMemory.Test/ControllerTest.cs b/src/Identity/test/InMemory.Test/ControllerTest.cs similarity index 100% rename from src/Identity/Identity/test/InMemory.Test/ControllerTest.cs rename to src/Identity/test/InMemory.Test/ControllerTest.cs diff --git a/src/Identity/Identity/test/InMemory.Test/FunctionalTest.cs b/src/Identity/test/InMemory.Test/FunctionalTest.cs similarity index 100% rename from src/Identity/Identity/test/InMemory.Test/FunctionalTest.cs rename to src/Identity/test/InMemory.Test/FunctionalTest.cs diff --git a/src/Identity/Identity/test/InMemory.Test/InMemoryStore.cs b/src/Identity/test/InMemory.Test/InMemoryStore.cs similarity index 100% rename from src/Identity/Identity/test/InMemory.Test/InMemoryStore.cs rename to src/Identity/test/InMemory.Test/InMemoryStore.cs diff --git a/src/Identity/Identity/test/InMemory.Test/InMemoryStoreTest.cs b/src/Identity/test/InMemory.Test/InMemoryStoreTest.cs similarity index 100% rename from src/Identity/Identity/test/InMemory.Test/InMemoryStoreTest.cs rename to src/Identity/test/InMemory.Test/InMemoryStoreTest.cs diff --git a/src/Identity/Identity/test/InMemory.Test/InMemoryUserStore.cs b/src/Identity/test/InMemory.Test/InMemoryUserStore.cs similarity index 100% rename from src/Identity/Identity/test/InMemory.Test/InMemoryUserStore.cs rename to src/Identity/test/InMemory.Test/InMemoryUserStore.cs diff --git a/src/Identity/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs b/src/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs similarity index 100% rename from src/Identity/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs rename to src/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs diff --git a/src/Identity/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj similarity index 88% rename from src/Identity/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj rename to src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj index f8c9bd64f7..8f1b267e17 100644 --- a/src/Identity/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj +++ b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Identity/Identity/test/InMemory.Test/TestClock.cs b/src/Identity/test/InMemory.Test/TestClock.cs similarity index 100% rename from src/Identity/Identity/test/InMemory.Test/TestClock.cs rename to src/Identity/test/InMemory.Test/TestClock.cs diff --git a/src/Identity/Shared/ApiConsistencyTestBase.cs b/src/Identity/test/Shared/ApiConsistencyTestBase.cs similarity index 100% rename from src/Identity/Shared/ApiConsistencyTestBase.cs rename to src/Identity/test/Shared/ApiConsistencyTestBase.cs diff --git a/src/Identity/Shared/MockHelpers.cs b/src/Identity/test/Shared/MockHelpers.cs similarity index 100% rename from src/Identity/Shared/MockHelpers.cs rename to src/Identity/test/Shared/MockHelpers.cs diff --git a/src/Identity/Shared/PocoRole.cs b/src/Identity/test/Shared/PocoModel/PocoRole.cs similarity index 100% rename from src/Identity/Shared/PocoRole.cs rename to src/Identity/test/Shared/PocoModel/PocoRole.cs diff --git a/src/Identity/Shared/PocoRoleClaim.cs b/src/Identity/test/Shared/PocoModel/PocoRoleClaim.cs similarity index 100% rename from src/Identity/Shared/PocoRoleClaim.cs rename to src/Identity/test/Shared/PocoModel/PocoRoleClaim.cs diff --git a/src/Identity/Shared/PocoUser.cs b/src/Identity/test/Shared/PocoModel/PocoUser.cs similarity index 100% rename from src/Identity/Shared/PocoUser.cs rename to src/Identity/test/Shared/PocoModel/PocoUser.cs diff --git a/src/Identity/Shared/PocoUserClaim.cs b/src/Identity/test/Shared/PocoModel/PocoUserClaim.cs similarity index 100% rename from src/Identity/Shared/PocoUserClaim.cs rename to src/Identity/test/Shared/PocoModel/PocoUserClaim.cs diff --git a/src/Identity/Shared/PocoUserLogin.cs b/src/Identity/test/Shared/PocoModel/PocoUserLogin.cs similarity index 100% rename from src/Identity/Shared/PocoUserLogin.cs rename to src/Identity/test/Shared/PocoModel/PocoUserLogin.cs diff --git a/src/Identity/Shared/PocoUserRole.cs b/src/Identity/test/Shared/PocoModel/PocoUserRole.cs similarity index 100% rename from src/Identity/Shared/PocoUserRole.cs rename to src/Identity/test/Shared/PocoModel/PocoUserRole.cs diff --git a/src/Identity/Shared/PocoUserToken.cs b/src/Identity/test/Shared/PocoModel/PocoUserToken.cs similarity index 100% rename from src/Identity/Shared/PocoUserToken.cs rename to src/Identity/test/Shared/PocoModel/PocoUserToken.cs diff --git a/src/Identity/Shared/PriorityOrderer.cs b/src/Identity/test/Shared/PriorityOrderer.cs similarity index 100% rename from src/Identity/Shared/PriorityOrderer.cs rename to src/Identity/test/Shared/PriorityOrderer.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/ApplicationUserStartup.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationDbContext.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/ApplicationUser.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/00000000000000_CreateIdentitySchema.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.Designer.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/20180217170630_UpdateIdentitySchema.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Data/Migrations/IdentityDbContextModelSnapshot.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj similarity index 94% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj index bd140acdd5..a830e92e3e 100644 --- a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj +++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj @@ -6,8 +6,8 @@ - - + + @@ -41,4 +41,4 @@ - \ No newline at end of file + diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/NoIdentityStartup.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/NoIdentityStartup.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/NoIdentityStartup.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/NoIdentityStartup.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/About.cshtml.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contact.cshtml.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Contoso/Login.cshtml.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Error.cshtml.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Index.cshtml.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Privacy.cshtml.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_CookieConsentPartial.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_CookieConsentPartial.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_CookieConsentPartial.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_CookieConsentPartial.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ValidationScriptsPartial.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewStart.cshtml diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/PocoUser.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/PocoUser.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/PocoUser.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/PocoUser.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/PocoUserStartup.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/PocoUserStartup.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/PocoUserStartup.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/PocoUserStartup.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Program.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Program.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Program.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Program.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationBuilderExtensions.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationConstants.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationHandler.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoAuthenticationOptions.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/ContosoEmailSender.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Services/IdentityEmail.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Startup.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/Startup.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/Startup.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/Startup.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs rename to src/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.Development.json b/src/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.Development.json similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.Development.json rename to src/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.Development.json diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.json b/src/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.json similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.json rename to src/Identity/testassets/Identity.DefaultUI.WebSite/appsettings.json diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/bundleconfig.json b/src/Identity/testassets/Identity.DefaultUI.WebSite/bundleconfig.json similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/bundleconfig.json rename to src/Identity/testassets/Identity.DefaultUI.WebSite/bundleconfig.json diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.css similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.css rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.css diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.min.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.min.css similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.min.css rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/css/site.min.css diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/favicon.ico b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/favicon.ico similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/favicon.ico rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/favicon.ico diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner1.svg b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner1.svg similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner1.svg rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner1.svg diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner2.svg b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner2.svg similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner2.svg rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner2.svg diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner3.svg b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner3.svg similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner3.svg rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner3.svg diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner4.svg b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner4.svg similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner4.svg rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/images/banner4.svg diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.js similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.js rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.js diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.min.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.min.js similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.min.js rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/js/site.min.js diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/.bower.json b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/.bower.json similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/.bower.json rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/.bower.json diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/LICENSE diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/bootstrap/dist/js/npm.js diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/.bower.json b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/.bower.json similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/.bower.json rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/.bower.json diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/.bower.json b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/.bower.json similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/.bower.json rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/.bower.json diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/.bower.json b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/.bower.json similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/.bower.json rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/.bower.json diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/LICENSE.txt diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.js diff --git a/src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map b/src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from src/Identity/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map rename to src/Identity/testassets/Identity.DefaultUI.WebSite/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index d7d4b0fc0e..10e52f6a4c 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -1,5 +1,5 @@  - + $(StandardTestTfms) diff --git a/src/Security/Security.sln b/src/Security/Security.sln index da54b2161c..b8aa6968a4 100644 --- a/src/Security/Security.sln +++ b/src/Security/Security.sln @@ -96,7 +96,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagno EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{43AF597A-FCB8-41A5-8279-345FEE9A61AD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{43AF597A-FCB8-41A5-8279-345FEE9A61AD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{707CBFB4-4D35-479E-9BAF-39B4DA9782DE}" EndProject diff --git a/src/Servers/FunctionalTests.sln b/src/Servers/FunctionalTests.sln index 59d8df47dd..cae0411fc3 100644 --- a/src/Servers/FunctionalTests.sln +++ b/src/Servers/FunctionalTests.sln @@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Respon EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj", "{831EA089-7072-41CF-996A-75A3EF39D31E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9DD063D3-CAE1-49C2-9C24-DE3499E79322}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9DD063D3-CAE1-49C2-9C24-DE3499E79322}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{0DD5F47B-EDA3-405A-A2F3-08CB2566E30D}" EndProject diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj b/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj index 58e9e115d7..23d8506c06 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -2,6 +2,8 @@ $(StandardTestTfms) + + true diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HelloWorldTest.cs index 94eacdc098..78c6b30175 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -5,6 +5,7 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -19,13 +20,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact] + [ConditionalFact] public Task HelloWorld_IISExpress_Clr_X64_Portable() { return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, "V1"); } - [Fact] + [ConditionalFact] public Task HelloWorld_IISExpress_CoreClr_X64_Portable() { return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, "V1"); diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HttpsTest.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HttpsTest.cs index ab6aa0a315..b0073174e3 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/HttpsTest.cs @@ -8,6 +8,7 @@ using System.Net.Http; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -25,13 +26,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact] + [ConditionalFact] public Task Https_HelloWorld_CLR_X64() { return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396, "V1"); } - [Fact] + [ConditionalFact] public Task Https_HelloWorld_CoreCLR_X64_Portable() { return HttpsHelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44394, "V1"); @@ -95,13 +96,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - [Fact] + [ConditionalFact] public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable() { return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false, "V1"); } - [Fact] + [ConditionalFact] public Task Https_HelloWorld_NoClientCert_Clr_X64() { return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false, "V1"); diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 8f4d0d1a63..0f2903e679 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -11,6 +11,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -25,13 +26,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact] + [ConditionalFact] public Task NtlmAuthentication_Clr_X64_Portable() { return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051, "V1"); } - [Fact] + [ConditionalFact] public Task NtlmAuthentication_CoreClr_X64_Portable() { return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052, "V1"); diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/Properties/AssemblyInfo.cs index a150572c1f..1fcbe7f9f1 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/Properties/AssemblyInfo.cs +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/Properties/AssemblyInfo.cs @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // All functional tests in this project require a version of IIS express with an updated schema +using Microsoft.AspNetCore.Testing.xunit; using Xunit; [assembly: CollectionBehavior(DisableTestParallelization = true)] +[assembly: OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux)] diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/UpgradeFeatureDetectionTests.cs index 0e4dd61e78..c43dcb232f 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -6,6 +6,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -22,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact] + [ConditionalFact] public Task UpgradeFeatureDetectionDisabled_OutOfProcess_IISExpress_CoreClr_x64_Portable() { return UpgradeFeatureDetectionDeployer(RuntimeFlavor.CoreClr, diff --git a/src/Servers/IIS/IISIntegration/test/FunctionalTests/Utilities/Helpers.cs b/src/Servers/IIS/IISIntegration/test/FunctionalTests/Utilities/Helpers.cs index fcb5dda5ad..305c95dd77 100644 --- a/src/Servers/IIS/IISIntegration/test/FunctionalTests/Utilities/Helpers.cs +++ b/src/Servers/IIS/IISIntegration/test/FunctionalTests/Utilities/Helpers.cs @@ -19,7 +19,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests "..", // debug "..", // obj "..", // projectfolder - "iis", + "IIS", + "IISIntegration", "test", "testassets", name)); diff --git a/src/Servers/IIS/startvs.cmd b/src/Servers/IIS/startvs.cmd new file mode 100644 index 0000000000..6d4192f052 --- /dev/null +++ b/src/Servers/IIS/startvs.cmd @@ -0,0 +1,3 @@ +@ECHO OFF + +%~dp0..\..\..\startvs.cmd %~dp0IISIntegration.sln diff --git a/src/Servers/test/FunctionalTests/HelloWorldTest.cs b/src/Servers/test/FunctionalTests/HelloWorldTest.cs index 9b65060868..416ec7860b 100644 --- a/src/Servers/test/FunctionalTests/HelloWorldTest.cs +++ b/src/Servers/test/FunctionalTests/HelloWorldTest.cs @@ -54,7 +54,7 @@ namespace ServerComparison.FunctionalTests return HelloWorld(ServerType.Kestrel, runtimeFlavor, RuntimeArchitecture.x64, applicationType); } - [ConditionalTheory] + [ConditionalTheory(Skip = "Nginx tests are broken in PR checks: https://github.com/aspnet/AspNetCore-Internal/issues/1525")] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone)] diff --git a/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs index b0e8d7cb9b..4476b41b1e 100644 --- a/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs +++ b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs @@ -152,7 +152,7 @@ namespace ServerComparison.FunctionalTests } // Nginx - [ConditionalTheory] + [ConditionalTheory(Skip = "Nginx tests are broken in PR checks: https://github.com/aspnet/AspNetCore-Internal/issues/1525")] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(ServerType.Nginx, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.Nginx, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] @@ -161,7 +161,7 @@ namespace ServerComparison.FunctionalTests return ResponseCompression(serverType, runtimeFlavor, architecture, CheckNoCompressionAsync, applicationType, hostCompression: false); } - [ConditionalTheory] + [ConditionalTheory(Skip = "Nginx tests are broken in PR checks: https://github.com/aspnet/AspNetCore-Internal/issues/1525")] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(ServerType.Nginx, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.Nginx, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] @@ -179,7 +179,7 @@ namespace ServerComparison.FunctionalTests return ResponseCompression(serverType, runtimeFlavor, architecture, CheckHostCompressionAsync, applicationType, hostCompression: false); } - [ConditionalTheory] + [ConditionalTheory(Skip = "Nginx tests are broken in PR checks: https://github.com/aspnet/AspNetCore-Internal/issues/1525")] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(ServerType.Nginx, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.Nginx, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] diff --git a/src/Servers/test/FunctionalTests/ResponseTests.cs b/src/Servers/test/FunctionalTests/ResponseTests.cs index ad616310b8..32becd6e00 100644 --- a/src/Servers/test/FunctionalTests/ResponseTests.cs +++ b/src/Servers/test/FunctionalTests/ResponseTests.cs @@ -169,7 +169,7 @@ namespace ServerComparison.FunctionalTests } // Nginx - [ConditionalTheory] + [ConditionalTheory(Skip = "Nginx tests are broken in PR checks: https://github.com/aspnet/AspNetCore-Internal/issues/1525")] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone)] @@ -178,7 +178,7 @@ namespace ServerComparison.FunctionalTests return ResponseFormats(ServerType.Nginx, runtimeFlavor, RuntimeArchitecture.x64, CheckContentLengthAsync, applicationType); } - [ConditionalTheory] + [ConditionalTheory(Skip = "Nginx tests are broken in PR checks: https://github.com/aspnet/AspNetCore-Internal/issues/1525")] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone)] @@ -187,9 +187,7 @@ namespace ServerComparison.FunctionalTests return ResponseFormats(ServerType.Nginx, runtimeFlavor, RuntimeArchitecture.x64, CheckChunkedAsync, applicationType); } - - - [ConditionalTheory] + [ConditionalTheory(Skip = "Nginx tests are broken in PR checks: https://github.com/aspnet/AspNetCore-Internal/issues/1525")] [OSSkipCondition(OperatingSystems.Windows)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Portable)] [InlineData(RuntimeFlavor.CoreClr, ApplicationType.Standalone)] diff --git a/startvs.cmd b/startvs.cmd index 05cd3ebfda..a845380813 100644 --- a/startvs.cmd +++ b/startvs.cmd @@ -3,11 +3,11 @@ :: This command launches a Visual Studio solution with environment variables required to use a local version of the .NET Core SDK. IF "%DOTNET_HOME%"=="" ( - set DOTNET_HOME=%USERPROFILE%\.dotnet\x64 + set DOTNET_HOME=%USERPROFILE%\.dotnet ) :: This tells .NET Core to use the same dotnet.exe that build scripts use -SET DOTNET_ROOT=%DOTNET_HOME% +SET DOTNET_ROOT=%DOTNET_HOME%\x64 :: This tells .NET Core not to go looking for .NET Core in other places SET DOTNET_MULTILEVEL_LOOKUP=0 @@ -17,7 +17,7 @@ SET PATH=%DOTNET_ROOT%;%PATH% SET sln=%1 -IF NOT EXIST %DOTNET_ROOT%\dotnet.exe ( +IF NOT EXIST "%DOTNET_ROOT%\dotnet.exe" ( echo .NET Core has not yet been installed. Run `build.cmd -restore` to install tools exit /b 1 ) From 50996e3da158cccb7f380ee461b170b52c43947a Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Fri, 4 Jan 2019 11:22:25 -0800 Subject: [PATCH 75/80] Add missed reference to Razor SDK in Mvc test website (#6367) --- .../RazorPagesWithBasePathTest.cs | 2 +- .../RazorPagesClassLibrary/RazorPagesClassLibrary.csproj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs index e25ccfec87..1b833e2ce8 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs @@ -520,7 +520,7 @@ Hello from /Pages/Shared/"; Assert.Contains("Name is required", response); } - [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/6122")] + [Fact] public async Task PagesFromClassLibraries_CanBeServed() { // Act diff --git a/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj index 110ba0c8cc..62fe5f58b2 100644 --- a/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj +++ b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj @@ -11,6 +11,7 @@ + From 98cce23c67c819e4e05feabd8a4d3ee6f82a345f Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sat, 5 Jan 2019 09:28:24 +1300 Subject: [PATCH 76/80] Add routing information to DeveloperExceptionPage (#6320) --- .../DeveloperExceptionPageMiddleware.cs | 28 +- .../Views/CompilationErrorPage.Designer.cs | 134 ++-- .../Views/EndpointModel.cs | 13 + .../Views/ErrorPage.Designer.cs | 600 ++++++++++++------ .../Views/ErrorPage.cshtml | 162 +++-- .../Views/ErrorPage.css | 7 +- .../Views/ErrorPageModel.cs | 11 + .../Microsoft.AspNetCore.Diagnostics.csproj | 3 +- .../src/Properties/Resources.Designer.cs | 144 ++++- src/Middleware/Diagnostics/src/README.md | 12 + src/Middleware/Diagnostics/src/Resources.resx | 32 +- .../DeveloperExceptionPageSample.csproj | 1 + .../DeveloperExceptionPageSample/Startup.cs | 26 + 13 files changed, 861 insertions(+), 312 deletions(-) create mode 100644 src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/EndpointModel.cs create mode 100644 src/Middleware/Diagnostics/src/README.md diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs index c58c53ce8b..d1d40b2e07 100644 --- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs +++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs @@ -4,12 +4,15 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Diagnostics.Internal; using Microsoft.AspNetCore.Diagnostics.RazorViews; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -192,6 +195,27 @@ namespace Microsoft.AspNetCore.Diagnostics private Task DisplayRuntimeException(HttpContext context, Exception ex) { + var endpoint = context.Features.Get()?.Endpoint; + + EndpointModel endpointModel = null; + if (endpoint != null) + { + endpointModel = new EndpointModel(); + endpointModel.DisplayName = endpoint.DisplayName; + + if (endpoint is RouteEndpoint routeEndpoint) + { + endpointModel.RoutePattern = routeEndpoint.RoutePattern.RawText; + endpointModel.Order = routeEndpoint.Order; + + var httpMethods = endpoint.Metadata.GetMetadata()?.HttpMethods; + if (httpMethods != null) + { + endpointModel.HttpMethods = string.Join(", ", httpMethods); + } + } + } + var request = context.Request; var model = new ErrorPageModel @@ -200,7 +224,9 @@ namespace Microsoft.AspNetCore.Diagnostics ErrorDetails = _exceptionDetailsProvider.GetDetails(ex), Query = request.Query, Cookies = request.Cookies, - Headers = request.Headers + Headers = request.Headers, + RouteValues = request.RouteValues, + Endpoint = endpointModel }; var errorPage = new ErrorPage(model); diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs index d5342bf79a..718cd466b5 100644 --- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs +++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs @@ -3,12 +3,12 @@ namespace Microsoft.AspNetCore.Diagnostics.RazorViews { #line hidden + using System.Threading.Tasks; #line 1 "CompilationErrorPage.cshtml" using System; #line default #line hidden - using System.Threading.Tasks; #line 2 "CompilationErrorPage.cshtml" using System.Globalization; @@ -62,11 +62,6 @@ using Microsoft.AspNetCore.Diagnostics.RazorViews; background-color: #fff; } -h1, h2, h3, h4, h5 { - /*font-family: 'Segoe UI',Tahoma,Arial,Helvetica,sans-serif;*/ - font-weight: 100; -} - h1 { color: #44525e; margin: 15px 0 15px 0; @@ -79,10 +74,12 @@ h2 { h3 { color: #363636; margin: 5px 5px 0 0; + font-weight: normal; } code { font-family: Consolas, ""Courier New"", courier, monospace; + font-weight: bold; } body .titleerror { @@ -112,10 +109,10 @@ body .location { cursor: pointer; } - #h"); - WriteLiteral(@"eader .selected { + #header .selected { background: #44c5f2; - color: #fff; + color: #fff"); + WriteLiteral(@"; } #stackpage ul { @@ -169,10 +166,15 @@ body .location { color: #606060; } +#routingpage .subheader { + padding: 5px; + border-bottom: 1px #ddd solid; +} + .page table { - border-collapse: separate; - bo"); - WriteLiteral(@"rder-spacing: 0; + border-collapse"); + WriteLiteral(@": separate; + border-spacing: 0; margin: 0 0 20px; } @@ -227,9 +229,9 @@ a { } .rawExceptionStackTrace { - font-size: 1.2em; -"); - WriteLiteral(@"} + "); + WriteLiteral(@"font-size: 1.2em; +} .rawExceptionBlock { border-top: 1px #ddd solid; @@ -259,21 +261,20 @@ a {

    "); -#line 222 "CompilationErrorPage.cshtml" +#line 224 "CompilationErrorPage.cshtml" Write(Resources.ErrorPageHtml_CompilationException); #line default #line hidden WriteLiteral("

    \r\n"); -#line 223 "CompilationErrorPage.cshtml" +#line 225 "CompilationErrorPage.cshtml" var exceptionDetailId = ""; #line default #line hidden - WriteLiteral(" "); -#line 226 "CompilationErrorPage.cshtml" +#line 228 "CompilationErrorPage.cshtml" for (var i = 0; i < Model.ErrorDetails.Count; i++) { var errorDetail = Model.ErrorDetails[i]; @@ -283,7 +284,7 @@ a { #line default #line hidden WriteLiteral("
    \r\n"); -#line 232 "CompilationErrorPage.cshtml" +#line 234 "CompilationErrorPage.cshtml" var stackFrameCount = 0; var frameId = ""; @@ -294,39 +295,38 @@ a { #line default #line hidden WriteLiteral("
    "); -#line 238 "CompilationErrorPage.cshtml" +#line 240 "CompilationErrorPage.cshtml" Write(fileName); #line default #line hidden WriteLiteral("
    \r\n"); -#line 239 "CompilationErrorPage.cshtml" +#line 241 "CompilationErrorPage.cshtml" } #line default #line hidden - WriteLiteral(" "); -#line 241 "CompilationErrorPage.cshtml" +#line 243 "CompilationErrorPage.cshtml" if (!string.IsNullOrEmpty(errorDetail.ErrorMessage)) { #line default #line hidden WriteLiteral("
    "); -#line 243 "CompilationErrorPage.cshtml" +#line 245 "CompilationErrorPage.cshtml" Write(errorDetail.ErrorMessage); #line default #line hidden WriteLiteral("
    \r\n"); -#line 244 "CompilationErrorPage.cshtml" +#line 246 "CompilationErrorPage.cshtml" } #line default #line hidden WriteLiteral("
    \r\n
      \r\n"); -#line 247 "CompilationErrorPage.cshtml" +#line 249 "CompilationErrorPage.cshtml" foreach (var frame in errorDetail.StackFrames) { stackFrameCount++; @@ -336,198 +336,198 @@ a { #line default #line hidden WriteLiteral("
    • "); -#line 267 "CompilationErrorPage.cshtml" +#line 269 "CompilationErrorPage.cshtml" Write(line); #line default #line hidden WriteLiteral("
      • \r\n"); -#line 268 "CompilationErrorPage.cshtml" +#line 270 "CompilationErrorPage.cshtml" } #line default #line hidden WriteLiteral(" \r\n"); -#line 270 "CompilationErrorPage.cshtml" +#line 272 "CompilationErrorPage.cshtml" } #line default #line hidden WriteLiteral("
    \r\n"); -#line 287 "CompilationErrorPage.cshtml" +#line 289 "CompilationErrorPage.cshtml" } #line default #line hidden WriteLiteral(" \r\n"); -#line 289 "CompilationErrorPage.cshtml" +#line 291 "CompilationErrorPage.cshtml" } #line default #line hidden WriteLiteral(" \r\n
    \r\n \r\n"); -#line 293 "CompilationErrorPage.cshtml" +#line 295 "CompilationErrorPage.cshtml" if (!string.IsNullOrEmpty(Model.CompiledContent[i])) { #line default #line hidden WriteLiteral("
    \r\n
    \r\n \r\n
    \r\n
    \r\n \r\n"); -#line 303 "CompilationErrorPage.cshtml" +#line 305 "CompilationErrorPage.cshtml" } #line default #line hidden -#line 303 "CompilationErrorPage.cshtml" +#line 305 "CompilationErrorPage.cshtml" } diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/EndpointModel.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/EndpointModel.cs new file mode 100644 index 0000000000..b4b88187c5 --- /dev/null +++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/EndpointModel.cs @@ -0,0 +1,13 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +namespace Microsoft.AspNetCore.Diagnostics.RazorViews +{ + internal class EndpointModel + { + public string DisplayName { get; set; } + public string RoutePattern { get; set; } + public int? Order { get; set; } + public string HttpMethods { get; set; } + } +} diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.Designer.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.Designer.cs index ea4969b0ed..93e6126a1a 100644 --- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.Designer.cs +++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.Designer.cs @@ -3,12 +3,12 @@ namespace Microsoft.AspNetCore.Diagnostics.RazorViews { #line hidden + using System.Threading.Tasks; #line 1 "ErrorPage.cshtml" using System; #line default #line hidden - using System.Threading.Tasks; #line 2 "ErrorPage.cshtml" using System.Globalization; @@ -75,11 +75,6 @@ WriteAttributeValue("", 543, CultureInfo.CurrentUICulture.TwoLetterISOLanguageNa background-color: #fff; } -h1, h2, h3, h4, h5 { - /*font-family: 'Segoe UI',Tahoma,Arial,Helvetica,sans-serif;*/ - font-weight: 100; -} - h1 { color: #44525e; margin: 15px 0 15px 0; @@ -92,10 +87,12 @@ h2 { h3 { color: #363636; margin: 5px 5px 0 0; + font-weight: normal; } code { font-family: Consolas, ""Courier New"", courier, monospace; + font-weight: bold; } body .titleerror { @@ -125,10 +122,10 @@ body .location { cursor: pointer; } - #h"); - WriteLiteral(@"eader .selected { + #header .selected { background: #44c5f2; - color: #fff; + color: #fff"); + WriteLiteral(@"; } #stackpage ul { @@ -182,10 +179,15 @@ body .location { color: #606060; } +#routingpage .subheader { + padding: 5px; + border-bottom: 1px #ddd solid; +} + .page table { - border-collapse: separate; - bo"); - WriteLiteral(@"rder-spacing: 0; + border-collapse"); + WriteLiteral(@": separate; + border-spacing: 0; margin: 0 0 20px; } @@ -240,9 +242,9 @@ a { } .rawExceptionStackTrace { - font-size: 1.2em; -"); - WriteLiteral(@"} + "); + WriteLiteral(@"font-size: 1.2em; +} .rawExceptionBlock { border-top: 1px #ddd solid; @@ -272,33 +274,33 @@ a {

    "); -#line 228 "ErrorPage.cshtml" +#line 230 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_UnhandledException); #line default #line hidden WriteLiteral("

    \r\n"); -#line 229 "ErrorPage.cshtml" +#line 231 "ErrorPage.cshtml" foreach (var errorDetail in Model.ErrorDetails) { #line default #line hidden WriteLiteral("
    "); -#line 231 "ErrorPage.cshtml" +#line 233 "ErrorPage.cshtml" Write(errorDetail.Error.GetType().Name); #line default #line hidden WriteLiteral(": "); -#line 231 "ErrorPage.cshtml" +#line 233 "ErrorPage.cshtml" Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); #line default #line hidden WriteLiteral("
    \r\n"); -#line 232 "ErrorPage.cshtml" - +#line 234 "ErrorPage.cshtml" + var firstFrame = errorDetail.StackFrames.FirstOrDefault(); if (firstFrame != null) { @@ -310,33 +312,33 @@ a { #line default #line hidden WriteLiteral("

    "); -#line 240 "ErrorPage.cshtml" +#line 242 "ErrorPage.cshtml" Write(location); #line default #line hidden WriteLiteral(" in

    \r\n"); -#line 241 "ErrorPage.cshtml" +#line 243 "ErrorPage.cshtml" } else if (!string.IsNullOrEmpty(location)) { @@ -344,13 +346,13 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false); #line default #line hidden WriteLiteral("

    "); -#line 244 "ErrorPage.cshtml" +#line 246 "ErrorPage.cshtml" Write(location); #line default #line hidden WriteLiteral("

    \r\n"); -#line 245 "ErrorPage.cshtml" +#line 247 "ErrorPage.cshtml" } else { @@ -358,13 +360,13 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false); #line default #line hidden WriteLiteral("

    "); -#line 248 "ErrorPage.cshtml" +#line 250 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_UnknownLocation); #line default #line hidden WriteLiteral("

    \r\n"); -#line 249 "ErrorPage.cshtml" +#line 251 "ErrorPage.cshtml" } var reflectionTypeLoadException = errorDetail.Error as ReflectionTypeLoadException; @@ -376,26 +378,26 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false); #line default #line hidden WriteLiteral("

    Loader Exceptions:

    \r\n
      \r\n"); -#line 258 "ErrorPage.cshtml" +#line 260 "ErrorPage.cshtml" foreach (var ex in reflectionTypeLoadException.LoaderExceptions) { #line default #line hidden WriteLiteral("
    • "); -#line 260 "ErrorPage.cshtml" +#line 262 "ErrorPage.cshtml" Write(ex.Message); #line default #line hidden WriteLiteral("
      • \r\n"); -#line 261 "ErrorPage.cshtml" +#line 263 "ErrorPage.cshtml" } #line default #line hidden WriteLiteral("
    \r\n"); -#line 263 "ErrorPage.cshtml" +#line 265 "ErrorPage.cshtml" } } } @@ -403,31 +405,37 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false); #line default #line hidden WriteLiteral("
      \r\n
    • \r\n "); -#line 268 "ErrorPage.cshtml" +#line 270 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_StackButton); #line default #line hidden WriteLiteral("\r\n
      • \r\n
    • \r\n "); -#line 271 "ErrorPage.cshtml" +#line 273 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_QueryButton); #line default #line hidden WriteLiteral("\r\n
      • \r\n
    • \r\n "); -#line 274 "ErrorPage.cshtml" +#line 276 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_CookiesButton); #line default #line hidden WriteLiteral("\r\n
      • \r\n
    • \r\n "); -#line 277 "ErrorPage.cshtml" +#line 279 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_HeadersButton); +#line default +#line hidden + WriteLiteral("\r\n
      • \r\n
    • \r\n "); +#line 282 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_RoutingButton); + #line default #line hidden WriteLiteral("\r\n
      • \r\n
    \r\n\r\n
    \r\n
      \r\n"); -#line 283 "ErrorPage.cshtml" +#line 288 "ErrorPage.cshtml" var exceptionCount = 0; var stackFrameCount = 0; @@ -437,8 +445,7 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false); #line default #line hidden - WriteLiteral(" "); -#line 289 "ErrorPage.cshtml" +#line 294 "ErrorPage.cshtml" foreach (var errorDetail in Model.ErrorDetails) { exceptionCount++; @@ -448,267 +455,267 @@ WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false); #line default #line hidden WriteLiteral("
    • \r\n

      "); -#line 295 "ErrorPage.cshtml" +#line 300 "ErrorPage.cshtml" Write(errorDetail.Error.GetType().Name); #line default #line hidden WriteLiteral(": "); -#line 295 "ErrorPage.cshtml" +#line 300 "ErrorPage.cshtml" Write(errorDetail.Error.Message); #line default #line hidden WriteLiteral("

      \r\n
        \r\n"); -#line 297 "ErrorPage.cshtml" - foreach (var frame in errorDetail.StackFrames) - { - stackFrameCount++; - frameId = "frame" + stackFrameCount; +#line 302 "ErrorPage.cshtml" + foreach (var frame in errorDetail.StackFrames) + { + stackFrameCount++; + frameId = "frame" + stackFrameCount; #line default #line hidden - WriteLiteral("
      • "); -#line 321 "ErrorPage.cshtml" - Write(line); + WriteLiteral("
      • "); +#line 326 "ErrorPage.cshtml" + Write(line); #line default #line hidden WriteLiteral("
        • \r\n"); -#line 322 "ErrorPage.cshtml" - } +#line 327 "ErrorPage.cshtml" + } #line default #line hidden - WriteLiteral(" \r\n"); -#line 324 "ErrorPage.cshtml" - } + WriteLiteral(" \r\n"); +#line 329 "ErrorPage.cshtml" + } #line default #line hidden - WriteLiteral("\r\n
    \r\n"); + WriteLiteral("
  • "); #line 343 "ErrorPage.cshtml" - } + Write(line); #line default #line hidden - WriteLiteral("
    • \r\n"); -#line 345 "ErrorPage.cshtml" - } + WriteLiteral("\r\n"); +#line 344 "ErrorPage.cshtml" + } + +#line default +#line hidden + WriteLiteral(" \r\n"); +#line 346 "ErrorPage.cshtml" + } + +#line default +#line hidden + WriteLiteral(" \r\n"); +#line 348 "ErrorPage.cshtml" + } + +#line default +#line hidden + WriteLiteral(" \r\n"); +#line 350 "ErrorPage.cshtml" + } #line default #line hidden WriteLiteral(@"
  • -
    +
    \r\n
    \r\n
    \r\n \r\n
    • \r\n"); -#line 359 "ErrorPage.cshtml" +#line 364 "ErrorPage.cshtml" } #line default #line hidden WriteLiteral(" \r\n \r\n\r\n
    \r\n"); -#line 364 "ErrorPage.cshtml" +#line 369 "ErrorPage.cshtml" if (Model.Query.Any()) { #line default #line hidden WriteLiteral(" \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n"); -#line 374 "ErrorPage.cshtml" +#line 379 "ErrorPage.cshtml" foreach (var kv in Model.Query.OrderBy(kv => kv.Key)) { foreach (var v in kv.Value) @@ -717,26 +724,26 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false); #line default #line hidden WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 382 "ErrorPage.cshtml" +#line 387 "ErrorPage.cshtml" } } #line default #line hidden WriteLiteral(" \r\n
    "); -#line 369 "ErrorPage.cshtml" +#line 374 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_VariableColumn); #line default #line hidden WriteLiteral(""); -#line 370 "ErrorPage.cshtml" +#line 375 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_ValueColumn); #line default #line hidden WriteLiteral("
    "); -#line 379 "ErrorPage.cshtml" +#line 384 "ErrorPage.cshtml" Write(kv.Key); #line default #line hidden WriteLiteral(""); -#line 380 "ErrorPage.cshtml" +#line 385 "ErrorPage.cshtml" Write(v); #line default #line hidden WriteLiteral("
    \r\n"); -#line 386 "ErrorPage.cshtml" +#line 391 "ErrorPage.cshtml" } else { @@ -744,63 +751,63 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false); #line default #line hidden WriteLiteral("

    "); -#line 389 "ErrorPage.cshtml" +#line 394 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_NoQueryStringData); #line default #line hidden WriteLiteral("

    \r\n"); -#line 390 "ErrorPage.cshtml" +#line 395 "ErrorPage.cshtml" } #line default #line hidden WriteLiteral("
    \r\n\r\n
    \r\n"); -#line 394 "ErrorPage.cshtml" +#line 399 "ErrorPage.cshtml" if (Model.Cookies.Any()) { #line default #line hidden WriteLiteral(" \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n"); -#line 404 "ErrorPage.cshtml" +#line 409 "ErrorPage.cshtml" foreach (var kv in Model.Cookies.OrderBy(kv => kv.Key)) { #line default #line hidden WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 410 "ErrorPage.cshtml" +#line 415 "ErrorPage.cshtml" } #line default #line hidden WriteLiteral(" \r\n
    "); -#line 399 "ErrorPage.cshtml" +#line 404 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_VariableColumn); #line default #line hidden WriteLiteral(""); -#line 400 "ErrorPage.cshtml" +#line 405 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_ValueColumn); #line default #line hidden WriteLiteral("
    "); -#line 407 "ErrorPage.cshtml" +#line 412 "ErrorPage.cshtml" Write(kv.Key); #line default #line hidden WriteLiteral(""); -#line 408 "ErrorPage.cshtml" +#line 413 "ErrorPage.cshtml" Write(kv.Value); #line default #line hidden WriteLiteral("
    \r\n"); -#line 413 "ErrorPage.cshtml" +#line 418 "ErrorPage.cshtml" } else { @@ -808,38 +815,38 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false); #line default #line hidden WriteLiteral("

    "); -#line 416 "ErrorPage.cshtml" +#line 421 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_NoCookieData); #line default #line hidden WriteLiteral("

    \r\n"); -#line 417 "ErrorPage.cshtml" +#line 422 "ErrorPage.cshtml" } #line default #line hidden - WriteLiteral("
    \r\n
    \r\n"); -#line 420 "ErrorPage.cshtml" + WriteLiteral("
    \r\n\r\n
    \r\n"); +#line 426 "ErrorPage.cshtml" if (Model.Headers.Any()) { #line default #line hidden WriteLiteral(" \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n"); -#line 430 "ErrorPage.cshtml" +#line 436 "ErrorPage.cshtml" foreach (var kv in Model.Headers.OrderBy(kv => kv.Key)) { foreach (var v in kv.Value) @@ -848,26 +855,26 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false); #line default #line hidden WriteLiteral(" \r\n \r\n \r\n \r\n"); -#line 438 "ErrorPage.cshtml" +#line 444 "ErrorPage.cshtml" } } #line default #line hidden WriteLiteral(" \r\n
    "); -#line 425 "ErrorPage.cshtml" +#line 431 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_VariableColumn); #line default #line hidden WriteLiteral(""); -#line 426 "ErrorPage.cshtml" +#line 432 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_ValueColumn); #line default #line hidden WriteLiteral("
    "); -#line 435 "ErrorPage.cshtml" +#line 441 "ErrorPage.cshtml" Write(kv.Key); #line default #line hidden WriteLiteral(""); -#line 436 "ErrorPage.cshtml" +#line 442 "ErrorPage.cshtml" Write(v); #line default #line hidden WriteLiteral("
    \r\n"); -#line 442 "ErrorPage.cshtml" +#line 448 "ErrorPage.cshtml" } else { @@ -875,18 +882,219 @@ WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false); #line default #line hidden WriteLiteral("

    "); -#line 445 "ErrorPage.cshtml" +#line 451 "ErrorPage.cshtml" Write(Resources.ErrorPageHtml_NoHeaderData); #line default #line hidden WriteLiteral("

    \r\n"); -#line 446 "ErrorPage.cshtml" +#line 452 "ErrorPage.cshtml" + } + +#line default +#line hidden + WriteLiteral("
    \r\n\r\n
    \r\n

    "); +#line 456 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_Endpoint); + +#line default +#line hidden + WriteLiteral("

    \r\n"); +#line 457 "ErrorPage.cshtml" + if (Model.Endpoint != null) + { + +#line default +#line hidden + WriteLiteral(" \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n"); +#line 471 "ErrorPage.cshtml" + if (!string.IsNullOrEmpty(Model.Endpoint.RoutePattern)) + { + +#line default +#line hidden + WriteLiteral(" \r\n \r\n \r\n \r\n"); +#line 477 "ErrorPage.cshtml" + } + +#line default +#line hidden +#line 478 "ErrorPage.cshtml" + if (Model.Endpoint.Order != null) + { + +#line default +#line hidden + WriteLiteral(" \r\n \r\n \r\n \r\n"); +#line 484 "ErrorPage.cshtml" + } + +#line default +#line hidden +#line 485 "ErrorPage.cshtml" + if (!string.IsNullOrEmpty(Model.Endpoint.HttpMethods)) + { + +#line default +#line hidden + WriteLiteral(" \r\n \r\n \r\n \r\n"); +#line 491 "ErrorPage.cshtml" + } + +#line default +#line hidden + WriteLiteral(" \r\n
    "); +#line 462 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_NameColumn); + +#line default +#line hidden + WriteLiteral(""); +#line 463 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_ValueColumn); + +#line default +#line hidden + WriteLiteral("
    "); +#line 468 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_EndpointDisplayName); + +#line default +#line hidden + WriteLiteral(""); +#line 469 "ErrorPage.cshtml" + Write(Model.Endpoint.DisplayName); + +#line default +#line hidden + WriteLiteral("
    "); +#line 474 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_EndpointRoutePattern); + +#line default +#line hidden + WriteLiteral(""); +#line 475 "ErrorPage.cshtml" + Write(Model.Endpoint.RoutePattern); + +#line default +#line hidden + WriteLiteral("
    "); +#line 481 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_EndpointRouteOrder); + +#line default +#line hidden + WriteLiteral(""); +#line 482 "ErrorPage.cshtml" + Write(Model.Endpoint.Order); + +#line default +#line hidden + WriteLiteral("
    "); +#line 488 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_EndpointRouteHttpMethod); + +#line default +#line hidden + WriteLiteral(""); +#line 489 "ErrorPage.cshtml" + Write(Model.Endpoint.HttpMethods); + +#line default +#line hidden + WriteLiteral("
    \r\n"); +#line 494 "ErrorPage.cshtml" + } + else + { + +#line default +#line hidden + WriteLiteral("

    "); +#line 497 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_NoEndpoint); + +#line default +#line hidden + WriteLiteral("

    \r\n"); +#line 498 "ErrorPage.cshtml" + } + +#line default +#line hidden + WriteLiteral("

    "); +#line 499 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_RouteValues); + +#line default +#line hidden + WriteLiteral("

    \r\n"); +#line 500 "ErrorPage.cshtml" + if (Model.RouteValues != null && Model.RouteValues.Any()) + { + +#line default +#line hidden + WriteLiteral(" \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n"); +#line 510 "ErrorPage.cshtml" + foreach (var kv in Model.RouteValues.OrderBy(kv => kv.Key)) + { + +#line default +#line hidden + WriteLiteral(" \r\n \r\n \r\n \r\n"); +#line 516 "ErrorPage.cshtml" + } + +#line default +#line hidden + WriteLiteral(" \r\n
    "); +#line 505 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_VariableColumn); + +#line default +#line hidden + WriteLiteral(""); +#line 506 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_ValueColumn); + +#line default +#line hidden + WriteLiteral("
    "); +#line 513 "ErrorPage.cshtml" + Write(kv.Key); + +#line default +#line hidden + WriteLiteral(""); +#line 514 "ErrorPage.cshtml" + Write(kv.Value); + +#line default +#line hidden + WriteLiteral("
    \r\n"); +#line 519 "ErrorPage.cshtml" + } + else + { + +#line default +#line hidden + WriteLiteral("

    "); +#line 522 "ErrorPage.cshtml" + Write(Resources.ErrorPageHtml_NoRouteValues); + +#line default +#line hidden + WriteLiteral("

    \r\n"); +#line 523 "ErrorPage.cshtml" } #line default #line hidden WriteLiteral(@"
    +