diff --git a/Directory.Build.targets b/Directory.Build.targets index bd768a49b0..0e9202f0c7 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -38,6 +38,9 @@ true + + true + false diff --git a/build/buildorder.props b/build/buildorder.props index b51d1cfa39..31803c24a5 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -8,7 +8,6 @@ - diff --git a/build/repo.props b/build/repo.props index 042d08c18b..3a93af4b5e 100644 --- a/build/repo.props +++ b/build/repo.props @@ -46,49 +46,60 @@ - - + + + + + + + + + + - + - - + + - - + + - - - + + + + + diff --git a/build/submodules.props b/build/submodules.props index a7e78f1a4d..4b874aa953 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -45,7 +45,6 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 9645bd8e84..0eed5d0ae8 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -24,28 +24,6 @@ 2.1.1 - - - 2.1.6 - - - - - - - - - - - - - - - - - - - 2.1.1 @@ -57,19 +35,6 @@ - - - 2.1.2 - - - - - - - - - - 2.1.1 @@ -79,6 +44,26 @@ + + + 2.1.1 + + + + + + + + + + 2.1.1 + + + + + + + 2.1.2 @@ -156,13 +141,18 @@ - - + + 2.1.2 - + + + + + + @@ -172,6 +162,14 @@ + + + 2.1.2 + + + + + 2.1.3 @@ -541,6 +539,18 @@ + + + 2.1.2 + + + + + + + + + 2.1.3 @@ -615,18 +625,6 @@ - - - 2.1.2 - - - - - - - - - 2.1.3 @@ -661,13 +659,6 @@ - - - 2.1.2 - - - - 2.1.2 @@ -687,6 +678,13 @@ + + + 2.1.2 + + + + 2.1.1 @@ -747,6 +745,17 @@ + + + 2.1.1 + + + + + + + + 2.1.2 @@ -852,17 +861,6 @@ - - - 2.1.1 - - - - - - - - 2.1.1 @@ -929,6 +927,28 @@ + + + 2.1.6 + + + + + + + + + + + + + + + + + + + 2.1.2 @@ -952,6 +972,11 @@ + + + 2.1.2 + + 2.1.2 @@ -960,9 +985,4 @@ - - - 2.1.2 - - \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 3a740e316d..9d3e931544 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -9,10 +9,10 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - - + + @@ -23,8 +23,9 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + + @@ -65,26 +66,27 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + - - + + @@ -92,7 +94,6 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - @@ -100,8 +101,9 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + - + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index bf7171f343..6a89badfc4 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -54,6 +54,7 @@ and are generated based on the last package release. + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 05a7e96c56..059308b49e 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -58,10 +58,6 @@ - - - - @@ -73,11 +69,14 @@ + + + @@ -114,9 +113,7 @@ - - - - + + diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index c3d8cebbcb..467633e75b 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -164,7 +164,7 @@ - + $([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectFullPath))) diff --git a/run.ps1 b/run.ps1 index 6b7e36c6cf..955a61c7e7 100644 --- a/run.ps1 +++ b/run.ps1 @@ -38,6 +38,9 @@ The path to the configuration file that stores values. Defaults to korebuild.jso .PARAMETER CI Sets up CI specific settings and variables. +.PARAMETER Projects +A list of projects to build. (Must be an absolute path.) Globbing patterns are supported, such as "$(pwd)/**/*.csproj" + .PARAMETER PackageVersionPropsUrl (optional) the url of the package versions props path containing dependency versions. @@ -90,6 +93,7 @@ param( [switch]$Reinstall, [string]$ConfigFile = $null, [switch]$CI, + [string]$Projects, [string]$PackageVersionPropsUrl = $null, [string]$AccessTokenSuffix = $null, [string]$RestoreSources = $null, @@ -237,6 +241,11 @@ if ($ProductBuildId) { $MSBuildArguments += "-p:DotNetProductBuildId=$ProductBuildId" } +if ($Projects) { + $MSBuildArguments += "-p:Projects=$Projects" + $MSBuildArguments += "-p:_ProjectsOnly=true" +} + # Execute $korebuildPath = Get-KoreBuild diff --git a/src/AADIntegration/.editorconfig b/src/AADIntegration/.editorconfig deleted file mode 100644 index abd3d48553..0000000000 --- a/src/AADIntegration/.editorconfig +++ /dev/null @@ -1,56 +0,0 @@ -# EditorConfig is awesome:http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Don't use tabs for indentation. -[*] -indent_style = space -# (Please don't specify an indent_size here; that has too many unintended consequences.) - -# Code files -[*.{cs,csx,vb,vbx}] -indent_size = 4 - -# Xml project files -[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] -indent_size = 2 - -# Xml config files -[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}] -indent_size = 2 - -# JSON files -[*.json] -indent_size = 2 - -# Dotnet code style settings: -[*.cs] -# Sort using and Import directives with System.* appearing first -dotnet_sort_system_directives_first = true - -# Don't use this. qualifier -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_property = false:suggestion - -# use int x = .. over Int32 -dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion - -# use int.MaxValue over Int32.MaxValue -dotnet_style_predefined_type_for_member_access = true:suggestion - -# Require var all the time. -csharp_style_var_for_built_in_types = true:suggestion -csharp_style_var_when_type_is_apparent = true:suggestion -csharp_style_var_elsewhere = true:suggestion - -# Disallow throw expressions. -csharp_style_throw_expression = false:suggestion - -# Newline settings -csharp_new_line_before_open_brace = all -csharp_new_line_before_else = true -csharp_new_line_before_catch = true -csharp_new_line_before_finally = true -csharp_new_line_before_members_in_object_initializers = true -csharp_new_line_before_members_in_anonymous_types = true diff --git a/src/AADIntegration/.gitignore b/src/AADIntegration/.gitignore deleted file mode 100644 index e38f0aa101..0000000000 --- a/src/AADIntegration/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -.build/ -.testPublish/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -.vs/ -bower_components/ -node_modules/ -debugSettings.json -project.lock.json -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.settings -*.sln.ide -node_modules -*launchSettings.json -*.orig -.vscode/ -global.json -BenchmarkDotNet.Artifacts/ -.idea/ -msbuild.binlog diff --git a/src/AADIntegration/AADIntegration.sln b/src/AADIntegration/AADIntegration.sln deleted file mode 100644 index 2ed6ef8876..0000000000 --- a/src/AADIntegration/AADIntegration.sln +++ /dev/null @@ -1,79 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{75A812B0-D98C-45F3-B2A9-357BBDF7331A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8CF63E1D-F9F7-4CB4-AD90-88C4077F7BFF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{57F46508-E53D-4F6B-B77C-2EFE95925AEF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureADB2CSample", "samples\AzureADB2CSample\AzureADB2CSample.csproj", "{5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI", "src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj", "{16912327-C9B3-49FC-87E0-49FEDED0A065}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test", "test\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj", "{454089F9-ED16-4A11-9C52-2BA74DCF5D35}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI", "src\Microsoft.AspNetCore.Authentication.AzureAD.UI\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj", "{1762840C-A14A-4498-9883-CC671956F0F2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI.Test", "test\Microsoft.AspNetCore.Authentication.AzureAD.UI.Test\Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj", "{3D0CF896-3A9D-4A8F-A343-A2E1A131C861}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests", "test\Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests\Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj", "{1967296B-614B-43E5-B1BA-A601579961D5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{2AEF59C3-7ADA-404D-B965-26B700FBD03F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureAD.WebSite", "test\WebSites\AzureAD.WebSite\AzureAD.WebSite.csproj", "{4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D2378D4-9DDA-468F-82C6-AE4DAA54E96C}.Release|Any CPU.Build.0 = Release|Any CPU - {16912327-C9B3-49FC-87E0-49FEDED0A065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16912327-C9B3-49FC-87E0-49FEDED0A065}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16912327-C9B3-49FC-87E0-49FEDED0A065}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16912327-C9B3-49FC-87E0-49FEDED0A065}.Release|Any CPU.Build.0 = Release|Any CPU - {454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {454089F9-ED16-4A11-9C52-2BA74DCF5D35}.Release|Any CPU.Build.0 = Release|Any CPU - {1762840C-A14A-4498-9883-CC671956F0F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1762840C-A14A-4498-9883-CC671956F0F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1762840C-A14A-4498-9883-CC671956F0F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1762840C-A14A-4498-9883-CC671956F0F2}.Release|Any CPU.Build.0 = Release|Any CPU - {3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D0CF896-3A9D-4A8F-A343-A2E1A131C861}.Release|Any CPU.Build.0 = Release|Any CPU - {1967296B-614B-43E5-B1BA-A601579961D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1967296B-614B-43E5-B1BA-A601579961D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1967296B-614B-43E5-B1BA-A601579961D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1967296B-614B-43E5-B1BA-A601579961D5}.Release|Any CPU.Build.0 = Release|Any CPU - {4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {5D2378D4-9DDA-468F-82C6-AE4DAA54E96C} = {8CF63E1D-F9F7-4CB4-AD90-88C4077F7BFF} - {16912327-C9B3-49FC-87E0-49FEDED0A065} = {75A812B0-D98C-45F3-B2A9-357BBDF7331A} - {454089F9-ED16-4A11-9C52-2BA74DCF5D35} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF} - {1762840C-A14A-4498-9883-CC671956F0F2} = {75A812B0-D98C-45F3-B2A9-357BBDF7331A} - {3D0CF896-3A9D-4A8F-A343-A2E1A131C861} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF} - {1967296B-614B-43E5-B1BA-A601579961D5} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF} - {2AEF59C3-7ADA-404D-B965-26B700FBD03F} = {57F46508-E53D-4F6B-B77C-2EFE95925AEF} - {4DB3C5B2-9FBF-42BC-80B2-2190EB1AE316} = {2AEF59C3-7ADA-404D-B965-26B700FBD03F} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {C6DBF56C-E862-46EA-A4E0-993D2950D78D} - EndGlobalSection -EndGlobal diff --git a/src/AADIntegration/Directory.Build.props b/src/AADIntegration/Directory.Build.props deleted file mode 100644 index 99160dadb6..0000000000 --- a/src/AADIntegration/Directory.Build.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core AAD Integration - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)..\..\eng\AspNetCore.snk - true - true - true - - - diff --git a/src/AADIntegration/Directory.Build.targets b/src/AADIntegration/Directory.Build.targets deleted file mode 100644 index 53b3f6e1da..0000000000 --- a/src/AADIntegration/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/AADIntegration/NuGetPackageVerifier.json b/src/AADIntegration/NuGetPackageVerifier.json deleted file mode 100644 index adc8b62fce..0000000000 --- a/src/AADIntegration/NuGetPackageVerifier.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ], - "packages": { - "Microsoft.AspNetCore.Authentication.AzureADB2C.UI": { - "Exclusions": { - "DOC_MISSING": { - "lib/netstandard2.0/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Views.dll": "This library contains precompiled views." - } - } - }, - "Microsoft.AspNetCore.Authentication.AzureAD.UI": { - "Exclusions": { - "DOC_MISSING": { - "lib/netstandard2.0/Microsoft.AspNetCore.Authentication.AzureAD.UI.Views.dll": "This library contains precompiled views." - } - } - } - } - } -} \ No newline at end of file diff --git a/src/AADIntegration/README.md b/src/AADIntegration/README.md deleted file mode 100644 index 5155df07d9..0000000000 --- a/src/AADIntegration/README.md +++ /dev/null @@ -1,14 +0,0 @@ -ASP.NET Core Azure Active Directory Integration -=== - - - -ASP.NET Core Azure Active Directory Integration provides seamless authentication integration with different Azure Active Directory services like Azure Active Directory and Azure Active Directory B2C for ASP.NET Core applications. - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. - -## Building from source - -To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. See [developer documentation](https://github.com/aspnet/Home/wiki) for more details. diff --git a/src/AADIntegration/Settings.StyleCop b/src/AADIntegration/Settings.StyleCop deleted file mode 100644 index 7b8130298c..0000000000 --- a/src/AADIntegration/Settings.StyleCop +++ /dev/null @@ -1,455 +0,0 @@ - - - NoMerge - - - - - False - - - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - - as - db - dc - do - ef - id - if - in - is - my - no - on - sl - to - ui - vs - - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - True - True - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - - - - Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - - - - - - False - - - - - - - False - - - - - False - - - - - - - - - Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - - - - - - 120 - - - - \ No newline at end of file diff --git a/src/AADIntegration/build/dependencies.props b/src/AADIntegration/build/dependencies.props deleted file mode 100644 index a7da074d56..0000000000 --- a/src/AADIntegration/build/dependencies.props +++ /dev/null @@ -1,47 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.1.3-rtm-15802 - 2.0.0 - 2.1.2 - 15.6.1 - 4.7.49 - 2.0.3 - 0.8.0 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.2 - 2.1.2 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - - \ No newline at end of file diff --git a/src/AADIntegration/build/repo.props b/src/AADIntegration/build/repo.props deleted file mode 100644 index 1dc8b8100d..0000000000 --- a/src/AADIntegration/build/repo.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/AADIntegration/build/sources.props b/src/AADIntegration/build/sources.props deleted file mode 100644 index f23d255142..0000000000 --- a/src/AADIntegration/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - \ No newline at end of file diff --git a/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj b/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj deleted file mode 100644 index 563c155642..0000000000 --- a/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - netcoreapp2.1 - $(TargetFrameworks);netcoreapp2.0 - $(TargetFrameworks);net461 - - - - true - - - - - - - - - - - - - - - - - diff --git a/src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json b/src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json deleted file mode 100644 index 1ee213cd17..0000000000 --- a/src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:59364/", - "sslPort": 44315 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "AzureADB2CSample": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:44315/;http://localhost:59364/" - } - } -} \ No newline at end of file diff --git a/src/AADIntegration/src/Directory.Build.props b/src/AADIntegration/src/Directory.Build.props deleted file mode 100644 index 4b89a431e7..0000000000 --- a/src/AADIntegration/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/AADIntegration/test/Directory.Build.props b/src/AADIntegration/test/Directory.Build.props deleted file mode 100644 index 92adb7d61c..0000000000 --- a/src/AADIntegration/test/Directory.Build.props +++ /dev/null @@ -1,25 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 - $(StandardTestTfms);net461 - - - - false - xUnit1026:$(WarningsNotAsErrors) - $(MSBuildThisFileDirectory)AADIntegration.ruleset - - - - - - - - - - - diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj deleted file mode 100644 index f0cb193135..0000000000 --- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj b/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj deleted file mode 100644 index b42cbf7947..0000000000 --- a/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - $(StandardTestWebsiteTfms) - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/AADIntegration/test/WebSites/Directory.Build.props b/src/AADIntegration/test/WebSites/Directory.Build.props deleted file mode 100644 index 5d16f204a2..0000000000 --- a/src/AADIntegration/test/WebSites/Directory.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - netcoreapp2.1 - $(DeveloperBuildTestWebsiteTfms) - $(StandardTestWebsiteTfms);netcoreapp2.0 - $(StandardTestWebsiteTfms);net461 - - \ No newline at end of file diff --git a/src/AADIntegration/version.props b/src/AADIntegration/version.props deleted file mode 100644 index 94459da446..0000000000 --- a/src/AADIntegration/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 2.1.1 - 0.4.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - $(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln new file mode 100644 index 0000000000..56ef0ae6f2 --- /dev/null +++ b/src/Azure/Azure.sln @@ -0,0 +1,284 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAD", "AzureAD", "{B931802A-45BB-49A4-9919-B36C827100AC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.AzureAD.UI", "Authentication.AzureAD.UI", "{312795E1-D5E2-4021-8FEA-342CA6F14CC8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI", "AzureAD\Authentication.AzureAD.UI\src\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj", "{0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.UI.Test", "AzureAD\Authentication.AzureAD.UI\test\Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj", "{06817D18-5694-454E-A010-CDAECD8AF89B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.AzureADB2C.UI", "Authentication.AzureADB2C.UI", "{79FE11AB-8D1E-4DEF-81C0-9B352769BFA4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI", "AzureAD\Authentication.AzureADB2C.UI\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj", "{6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test", "AzureAD\Authentication.AzureADB2C.UI\test\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj", "{C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A28A64CA-297E-4023-895A-483DFDA59FBE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureADB2CSample", "AzureAD\samples\AzureADB2CSample\AzureADB2CSample.csproj", "{A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F4F1E3C9-38E5-49EC-8688-A2D16AA8807B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests", "AzureAD\test\FunctionalTests\Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj", "{B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{0F577D33-2EA4-4182-9D89-2EFB022A2835}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAD.WebSite", "AzureAD\test\testassets\AzureAD.WebSite\AzureAD.WebSite.csproj", "{84E67496-B000-4AAD-9626-2135F677C4F1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{84622717-F98A-4DE2-806E-1EF89C45C0EB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{B1385496-607F-4573-ABE9-D9FE88D96DB8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{6EFFA596-23E7-498C-8D5E-331C6D8E945D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "..\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{9631D314-7B0C-4CEC-8650-0259A8F4C77A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "..\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{240BBDB1-3501-4637-8A17-996EA4EBB20B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{88EF760A-99A2-48C8-920F-78632A3BB57A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{9593691E-1B65-4EB1-97AA-F8B292B0082A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x64.ActiveCfg = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x64.Build.0 = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x86.ActiveCfg = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Debug|x86.Build.0 = Debug|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|Any CPU.Build.0 = Release|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x64.ActiveCfg = Release|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x64.Build.0 = Release|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x86.ActiveCfg = Release|Any CPU + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58}.Release|x86.Build.0 = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x64.ActiveCfg = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x64.Build.0 = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x86.ActiveCfg = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Debug|x86.Build.0 = Debug|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|Any CPU.Build.0 = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x64.ActiveCfg = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x64.Build.0 = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x86.ActiveCfg = Release|Any CPU + {06817D18-5694-454E-A010-CDAECD8AF89B}.Release|x86.Build.0 = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x64.ActiveCfg = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x64.Build.0 = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x86.ActiveCfg = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Debug|x86.Build.0 = Debug|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|Any CPU.Build.0 = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x64.ActiveCfg = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x64.Build.0 = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x86.ActiveCfg = Release|Any CPU + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C}.Release|x86.Build.0 = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x64.ActiveCfg = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x64.Build.0 = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x86.ActiveCfg = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Debug|x86.Build.0 = Debug|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|Any CPU.Build.0 = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x64.ActiveCfg = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x64.Build.0 = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x86.ActiveCfg = Release|Any CPU + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51}.Release|x86.Build.0 = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x64.ActiveCfg = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x64.Build.0 = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x86.ActiveCfg = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Debug|x86.Build.0 = Debug|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|Any CPU.Build.0 = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x64.ActiveCfg = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x64.Build.0 = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x86.ActiveCfg = Release|Any CPU + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE}.Release|x86.Build.0 = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x64.ActiveCfg = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x64.Build.0 = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x86.ActiveCfg = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Debug|x86.Build.0 = Debug|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|Any CPU.Build.0 = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x64.ActiveCfg = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x64.Build.0 = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x86.ActiveCfg = Release|Any CPU + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951}.Release|x86.Build.0 = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x64.ActiveCfg = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x64.Build.0 = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x86.ActiveCfg = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Debug|x86.Build.0 = Debug|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|Any CPU.Build.0 = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x64.ActiveCfg = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x64.Build.0 = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x86.ActiveCfg = Release|Any CPU + {84E67496-B000-4AAD-9626-2135F677C4F1}.Release|x86.Build.0 = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x64.ActiveCfg = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x64.Build.0 = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x86.ActiveCfg = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Debug|x86.Build.0 = Debug|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|Any CPU.Build.0 = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x64.ActiveCfg = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x64.Build.0 = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x86.ActiveCfg = Release|Any CPU + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529}.Release|x86.Build.0 = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x64.ActiveCfg = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x64.Build.0 = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x86.ActiveCfg = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Debug|x86.Build.0 = Debug|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|Any CPU.Build.0 = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x64.ActiveCfg = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x64.Build.0 = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x86.ActiveCfg = Release|Any CPU + {B1385496-607F-4573-ABE9-D9FE88D96DB8}.Release|x86.Build.0 = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x64.ActiveCfg = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x64.Build.0 = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x86.ActiveCfg = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Debug|x86.Build.0 = Debug|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|Any CPU.Build.0 = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x64.ActiveCfg = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x64.Build.0 = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x86.ActiveCfg = Release|Any CPU + {6EFFA596-23E7-498C-8D5E-331C6D8E945D}.Release|x86.Build.0 = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x64.ActiveCfg = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x64.Build.0 = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x86.ActiveCfg = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Debug|x86.Build.0 = Debug|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|Any CPU.Build.0 = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x64.ActiveCfg = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x64.Build.0 = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x86.ActiveCfg = Release|Any CPU + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D}.Release|x86.Build.0 = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x64.ActiveCfg = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x64.Build.0 = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x86.ActiveCfg = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Debug|x86.Build.0 = Debug|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|Any CPU.Build.0 = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x64.ActiveCfg = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x64.Build.0 = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x86.ActiveCfg = Release|Any CPU + {9631D314-7B0C-4CEC-8650-0259A8F4C77A}.Release|x86.Build.0 = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x64.ActiveCfg = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x64.Build.0 = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x86.ActiveCfg = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Debug|x86.Build.0 = Debug|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|Any CPU.Build.0 = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x64.ActiveCfg = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x64.Build.0 = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x86.ActiveCfg = Release|Any CPU + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2}.Release|x86.Build.0 = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x64.ActiveCfg = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x64.Build.0 = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x86.ActiveCfg = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Debug|x86.Build.0 = Debug|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|Any CPU.Build.0 = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x64.ActiveCfg = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x64.Build.0 = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x86.ActiveCfg = Release|Any CPU + {240BBDB1-3501-4637-8A17-996EA4EBB20B}.Release|x86.Build.0 = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x64.ActiveCfg = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x64.Build.0 = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x86.ActiveCfg = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Debug|x86.Build.0 = Debug|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|Any CPU.Build.0 = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x64.ActiveCfg = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x64.Build.0 = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x86.ActiveCfg = Release|Any CPU + {88EF760A-99A2-48C8-920F-78632A3BB57A}.Release|x86.Build.0 = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x64.ActiveCfg = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x64.Build.0 = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x86.ActiveCfg = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Debug|x86.Build.0 = Debug|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|Any CPU.Build.0 = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x64.ActiveCfg = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x64.Build.0 = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.ActiveCfg = Release|Any CPU + {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {312795E1-D5E2-4021-8FEA-342CA6F14CC8} = {B931802A-45BB-49A4-9919-B36C827100AC} + {0579BC3C-DC2C-440F-9FB9-F47ABD9B8A58} = {312795E1-D5E2-4021-8FEA-342CA6F14CC8} + {06817D18-5694-454E-A010-CDAECD8AF89B} = {312795E1-D5E2-4021-8FEA-342CA6F14CC8} + {79FE11AB-8D1E-4DEF-81C0-9B352769BFA4} = {B931802A-45BB-49A4-9919-B36C827100AC} + {6EC81D5C-D17C-4F11-9471-A8CDBDD8B76C} = {79FE11AB-8D1E-4DEF-81C0-9B352769BFA4} + {C4703BE0-E8DE-4A22-8653-9E2A20E2BE51} = {79FE11AB-8D1E-4DEF-81C0-9B352769BFA4} + {A28A64CA-297E-4023-895A-483DFDA59FBE} = {B931802A-45BB-49A4-9919-B36C827100AC} + {A81C6D14-8A7F-4AC0-B4E8-DF0A925C1ECE} = {A28A64CA-297E-4023-895A-483DFDA59FBE} + {F4F1E3C9-38E5-49EC-8688-A2D16AA8807B} = {B931802A-45BB-49A4-9919-B36C827100AC} + {B1FC9E6F-F2A2-4E3A-8CFC-0446C592C951} = {F4F1E3C9-38E5-49EC-8688-A2D16AA8807B} + {0F577D33-2EA4-4182-9D89-2EFB022A2835} = {F4F1E3C9-38E5-49EC-8688-A2D16AA8807B} + {84E67496-B000-4AAD-9626-2135F677C4F1} = {0F577D33-2EA4-4182-9D89-2EFB022A2835} + {CF6B45E8-BF6C-487F-A0D0-D3EA31D80529} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {B1385496-607F-4573-ABE9-D9FE88D96DB8} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {6EFFA596-23E7-498C-8D5E-331C6D8E945D} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {A3789DA9-2E0E-41D6-BDDD-11DA4D3DD72D} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {9631D314-7B0C-4CEC-8650-0259A8F4C77A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {01B31C53-7BAB-4DA7-A55D-C67D9B1FB4A2} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {240BBDB1-3501-4637-8A17-996EA4EBB20B} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {88EF760A-99A2-48C8-920F-78632A3BB57A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {9593691E-1B65-4EB1-97AA-F8B292B0082A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {81AADD49-473B-43ED-8A08-F6B7A058AA39} + EndGlobalSection +EndGlobal diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Controllers/AccountController.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Controllers/AccountController.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/_viewImports.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/_viewImports.cshtml rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/_ViewStart.cshtml rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAccountControllerFeatureProvider.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAccountControllerFeatureProvider.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAuthenticationBuilderExtensions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAuthenticationBuilderExtensions.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADDefaults.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADDefaults.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptions.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADSchemeOptions.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADSchemeOptions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADSchemeOptions.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADSchemeOptions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/CookieOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/CookieOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/CookieOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/CookieOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/JwtBearerOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/JwtBearerOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/JwtBearerOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/JwtBearerOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj similarity index 69% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj index 710d066434..52e285c025 100644 --- a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj +++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj @@ -10,11 +10,10 @@ - - - - - + + + + @@ -28,10 +27,10 @@ <_Parameter2>$(BuildNumber) - + - + diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/OpenIdConnectOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/OpenIdConnectOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/OpenIdConnectOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/OpenIdConnectOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Properties/AssemblyInfo.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Properties/AssemblyInfo.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/Properties/AssemblyInfo.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/baseline.netcore.json b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/baseline.netcore.json similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/baseline.netcore.json rename to src/Azure/AzureAD/Authentication.AzureAD.UI/src/baseline.netcore.json diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/AzureADAuthenticationBuilderExtensionsTests.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/AzureADAuthenticationBuilderExtensionsTests.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Controllers/AccountControllerTests.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Controllers/AccountControllerTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Controllers/AccountControllerTests.cs rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/Controllers/AccountControllerTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj similarity index 62% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj index 4daafb39ac..2b3fedc888 100644 --- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj +++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp2.1;net461 Microsoft.AspNetCore.Authentication.AzureAD.UI @@ -12,7 +12,7 @@ - + diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/xunit.runner.json b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/xunit.runner.json similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/xunit.runner.json rename to src/Azure/AzureAD/Authentication.AzureAD.UI/test/xunit.runner.json diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Controllers/AccountController.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Controllers/AccountController.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/_ViewStart.cshtml rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureADB2CAccountControllerFeatureProvider.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureADB2CAccountControllerFeatureProvider.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CAuthenticationBuilderExtensions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CAuthenticationBuilderExtensions.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CDefaults.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CDefaults.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COpenIDConnectEventHandlers.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COpenIDConnectEventHandlers.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptions.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CSchemeOptions.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CSchemeOptions.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CSchemeOptions.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CSchemeOptions.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/CookieOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/CookieOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/CookieOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/CookieOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/JwtBearerOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/JwtBearerOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/JwtBearerOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/JwtBearerOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj similarity index 69% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj index e63e02980f..cc93f8f052 100644 --- a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj +++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj @@ -10,11 +10,10 @@ - - - - - + + + + @@ -28,10 +27,10 @@ <_Parameter2>$(BuildNumber) - + - + diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/OpenIdConnectOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/OpenIdConnectOptionsConfiguration.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/OpenIdConnectOptionsConfiguration.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/OpenIdConnectOptionsConfiguration.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Properties/AssemblyInfo.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Properties/AssemblyInfo.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Properties/AssemblyInfo.cs diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/baseline.netcore.json b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/baseline.netcore.json similarity index 100% rename from src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/baseline.netcore.json rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/baseline.netcore.json diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2COpenIDConnectEventHandlersTests.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2COpenIDConnectEventHandlersTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2COpenIDConnectEventHandlersTests.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2COpenIDConnectEventHandlersTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Controllers/AccountControllerTests.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Controllers/AccountControllerTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Controllers/AccountControllerTests.cs rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Controllers/AccountControllerTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj similarity index 62% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj index a838fc2703..3e4b8691f4 100644 --- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj +++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp2.1;net461 Microsoft.AspNetCore.Authentication.AzureADB2C.UI @@ -12,7 +12,7 @@ - + diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/xunit.runner.json b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/xunit.runner.json similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/xunit.runner.json rename to src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/xunit.runner.json diff --git a/src/AADIntegration/test/AADIntegration.ruleset b/src/Azure/AzureAD/AzureAD.ruleset similarity index 69% rename from src/AADIntegration/test/AADIntegration.ruleset rename to src/Azure/AzureAD/AzureAD.ruleset index 23f2deac4a..57375fd55d 100644 --- a/src/AADIntegration/test/AADIntegration.ruleset +++ b/src/Azure/AzureAD/AzureAD.ruleset @@ -1,7 +1,7 @@  - + - diff --git a/src/Azure/AzureAD/Directory.Build.props b/src/Azure/AzureAD/Directory.Build.props new file mode 100644 index 0000000000..647d706b5a --- /dev/null +++ b/src/Azure/AzureAD/Directory.Build.props @@ -0,0 +1,8 @@ + + + + + xUnit1026:$(WarningsNotAsErrors) + $(MSBuildThisFileDirectory)AzureAD.ruleset + + diff --git a/src/Azure/AzureAD/README.md b/src/Azure/AzureAD/README.md new file mode 100644 index 0000000000..6086294419 --- /dev/null +++ b/src/Azure/AzureAD/README.md @@ -0,0 +1,4 @@ +Azure Active Directory Integration +================================== + +ASP.NET Core Azure Active Directory Integration provides seamless authentication integration with different Azure Active Directory services like Azure Active Directory and Azure Active Directory B2C for ASP.NET Core applications. \ No newline at end of file diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj new file mode 100644 index 0000000000..1074eff59f --- /dev/null +++ b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj @@ -0,0 +1,22 @@ + + + + netcoreapp2.1;net461 + + + + true + + + + + + + + + + + + + + diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml.cs b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml.cs similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml.cs rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml.cs diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewImports.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewImports.cshtml rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml diff --git a/src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewStart.cshtml similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewStart.cshtml rename to src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewStart.cshtml diff --git a/src/AADIntegration/samples/AzureADB2CSample/Program.cs b/src/Azure/AzureAD/samples/AzureADB2CSample/Program.cs similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Program.cs rename to src/Azure/AzureAD/samples/AzureADB2CSample/Program.cs diff --git a/src/AADIntegration/samples/AzureADB2CSample/Startup.cs b/src/Azure/AzureAD/samples/AzureADB2CSample/Startup.cs similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/Startup.cs rename to src/Azure/AzureAD/samples/AzureADB2CSample/Startup.cs diff --git a/src/AADIntegration/samples/AzureADB2CSample/appsettings.Development.json b/src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.Development.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/appsettings.Development.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.Development.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/appsettings.json b/src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/appsettings.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.css similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.css rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.css diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.min.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.min.css similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.min.css rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.min.css diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/favicon.ico b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/favicon.ico similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/favicon.ico rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/favicon.ico diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner1.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner1.svg similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner1.svg rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner1.svg diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner2.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner2.svg similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner2.svg rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner2.svg diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner3.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner3.svg similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner3.svg rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner3.svg diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner4.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner4.svg similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner4.svg rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner4.svg diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.min.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.min.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/js/site.min.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/js/site.min.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/.bower.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/LICENSE diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/bootstrap/dist/js/npm.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/.bower.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/.bower.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/.bower.json diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/LICENSE.txt diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.js diff --git a/src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map b/src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from src/AADIntegration/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map rename to src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/ApiAuthenticationTests.cs b/src/Azure/AzureAD/test/FunctionalTests/ApiAuthenticationTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/ApiAuthenticationTests.cs rename to src/Azure/AzureAD/test/FunctionalTests/ApiAuthenticationTests.cs diff --git a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj new file mode 100644 index 0000000000..059d4a8e12 --- /dev/null +++ b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj @@ -0,0 +1,22 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + + + + + + + + + + diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/WebAuthenticationTests.cs b/src/Azure/AzureAD/test/FunctionalTests/WebAuthenticationTests.cs similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/WebAuthenticationTests.cs rename to src/Azure/AzureAD/test/FunctionalTests/WebAuthenticationTests.cs diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/xunit.runner.json b/src/Azure/AzureAD/test/FunctionalTests/xunit.runner.json similarity index 100% rename from src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/xunit.runner.json rename to src/Azure/AzureAD/test/FunctionalTests/xunit.runner.json diff --git a/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj new file mode 100644 index 0000000000..2464d62582 --- /dev/null +++ b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/AzureAD.WebSite.csproj @@ -0,0 +1,25 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + + + + + + + + + + + + + diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/Controllers/TestController.cs b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Controllers/TestController.cs similarity index 100% rename from src/AADIntegration/test/WebSites/AzureAD.WebSite/Controllers/TestController.cs rename to src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Controllers/TestController.cs diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/Program.cs b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Program.cs similarity index 100% rename from src/AADIntegration/test/WebSites/AzureAD.WebSite/Program.cs rename to src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Program.cs diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/Startup.cs b/src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Startup.cs similarity index 100% rename from src/AADIntegration/test/WebSites/AzureAD.WebSite/Startup.cs rename to src/Azure/AzureAD/test/testassets/AzureAD.WebSite/Startup.cs diff --git a/src/Azure/build.cmd b/src/Azure/build.cmd new file mode 100644 index 0000000000..69e9805008 --- /dev/null +++ b/src/Azure/build.cmd @@ -0,0 +1,3 @@ +@ECHO OFF +SET RepoRoot=%~dp0..\.. +%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -Projects %~dp0\**\*.*proj %* diff --git a/src/Azure/startvs.cmd b/src/Azure/startvs.cmd new file mode 100644 index 0000000000..458c43b11a --- /dev/null +++ b/src/Azure/startvs.cmd @@ -0,0 +1,3 @@ +@ECHO OFF + +%~dp0..\..\startvs.cmd %~dp0Azure.sln diff --git a/src/DataProtection/build.cmd b/src/DataProtection/build.cmd index f4169ea5e4..f22573197f 100644 --- a/src/DataProtection/build.cmd +++ b/src/DataProtection/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF -SET RepoRoot="%~dp0..\.." -%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -Path %~dp0 %* +SET RepoRoot=%~dp0..\.. +%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -projects %~dp0**\*.*proj %* diff --git a/src/Razor/build.cmd b/src/Razor/build.cmd new file mode 100644 index 0000000000..f22573197f --- /dev/null +++ b/src/Razor/build.cmd @@ -0,0 +1,3 @@ +@ECHO OFF +SET RepoRoot=%~dp0..\.. +%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -projects %~dp0**\*.*proj %*