From d66537c7d12822c2c65905fda112e4c42dfca4cd Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 2 Jan 2019 09:56:39 -0800 Subject: [PATCH 1/4] 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 a10aff3a036dabb690ccfa5dad88972fd451ac71 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 2 Jan 2019 14:30:01 -0800 Subject: [PATCH 2/4] 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 436076fd551fdc6e24565381211ad3c5ebd7b589 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 4 Jan 2019 10:00:26 -0800 Subject: [PATCH 3/4] 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 0926b93b98e417cccb63fea16e60017bd46cfa2a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 4 Jan 2019 14:20:13 -0800 Subject: [PATCH 4/4] Ensure Identity.Views.{V3, V4}.dll are the AllItemsFullPathWithTargetPath group so they get copied across ProjectReferences --- .../Microsoft.AspNetCore.Identity.UI.csproj | 11 +++++----- ...AspNetCore.Identity.FunctionalTests.csproj | 20 ------------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj index e905165bf7..f85709c554 100644 --- a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj @@ -118,10 +118,11 @@ Name="_GetRazorDlls" BeforeTargets="GetCopyToOutputDirectoryItems"> - <_AllItemsFullPathWithTargetPath Include="$(MSBuildThisFileDirectory)$(IntermediateOutputPath)%(UIFrameworkVersionMoniker.Identity)\$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).*" /> + <_GeneratedRazorViews Include="$(TargetDir)$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).dll" /> + <_GeneratedRazorViews Include="$(TargetDir)$(TargetName).Views.%(UIFrameworkVersionMoniker.Identity).pdb" /> - - %(Filename)%(Extension) + + %(FileName)%(Extension) PreserveNewest @@ -143,8 +144,8 @@ - - + + - - - - <_IdentityUIViewsAssemblies Include="$(MSBuildThisFileDirectory)..\..\UI\src\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" /> - - - - - - - - - - - - -