huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge in 'release/2.1' changes

This commit is contained in:
dotnet-bot 2018-12-21 19:44:18 +00:00
parent 2ef7d55ef8 3641761d18
commit d13dd578f8
143 changed files with 565 additions and 1080 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Directory.Build.targets
View File

@ -38,6 +38,9 @@
<!-- Implementation projects are the projects which produce nuget packages or shipping assemblies. -->
<IsImplementationProject Condition=" '$(IsImplementationProject)' == '' AND '$(IsTestAssetProject)' != 'true' AND '$(IsTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsSampleProject)' != 'true' ">true</IsImplementationProject>
<!-- This determines whether a project is available as a <Reference> to other projects in this repo. -->
<IsProjectReferenceProvider Condition=" '$(IsProjectReferenceProvider)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(PackAsTool)' != 'true' ">true</IsProjectReferenceProvider>
<!-- Suppress KoreBuild warnings about the mismatch of repo version and local project version. The versioning in this mega repo is sufficiently complicated that KoreBuild's validation isn't helpful. -->
<VerifyVersion>false</VerifyVersion>

1
build/buildorder.props
View File

@ -8,7 +8,6 @@
<ItemGroup>
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
<RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
<RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\" />
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
<RepositoryBuildOrder Include="Scaffolding" Order="15" />

89
build/repo.props
View File

@ -46,49 +46,60 @@
<SharedFrameworkName Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup>
<SamplesProject Include="$(RepositoryRoot)src\**\samples\**\*.csproj;"/>
<Choose>
<!-- Project selection can be overridden on the command line by passing in -projects -->
<When Condition="'$(Projects)' != ''">
<ItemGroup>
<ProjectToBuild Include="$(Projects)" Exclude="@(ProjectToExclude)" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<SamplesProject Include="$(RepositoryRoot)src\**\samples\**\*.csproj;"/>
<ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/>
<ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/>
<!-- These projects use 'legacy' csproj, which is not supported by dotnet-msbuild. -->
<ProjectToExclude Include="
$(RepositoryRoot)src\Servers\HttpSys\samples\TestClient\TestClient.csproj;
$(RepositoryRoot)src\Middleware\WebSockets\samples\TestServer\TestServer.csproj;
"
Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
<!-- These projects use 'legacy' csproj, which is not supported by dotnet-msbuild. -->
<ProjectToExclude Include="
$(RepositoryRoot)src\Servers\HttpSys\samples\TestClient\TestClient.csproj;
$(RepositoryRoot)src\Middleware\WebSockets\samples\TestServer\TestServer.csproj;
"
Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
<ProjectToExclude Include="
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
$(RepositoryRoot)src\Middleware\NodeServices.Sockets\**\*.csproj;
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj
" />
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
<ProjectToExclude Include="
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
$(RepositoryRoot)src\Middleware\NodeServices.Sockets\**\*.csproj;
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj
" />
<ProjectToBuild Include="@(NativeProjects)" Condition="'$(OS)' == 'Windows_NT'"/>
<ProjectToBuild Include="
$(RepositoryRoot)src\DefaultBuilder\**\*.*proj;
$(RepositoryRoot)src\Features\JsonPatch\**\*.*proj;
$(RepositoryRoot)src\DataProtection\**\*.*proj;
$(RepositoryRoot)src\Antiforgery\**\*.*proj;
$(RepositoryRoot)src\Hosting\**\*.*proj;
$(RepositoryRoot)src\Http\**\*.*proj;
$(RepositoryRoot)src\Html\**\*.*proj;
$(RepositoryRoot)src\Servers\**\*.csproj;
$(RepositoryRoot)src\Servers\**\*.pkgproj;
$(RepositoryRoot)src\Security\**\*.*proj;
$(RepositoryRoot)src\Shared\**\*.*proj;
$(RepositoryRoot)src\Tools\**\*.*proj;
$(RepositoryRoot)src\Middleware\**\*.*proj;
$(RepositoryRoot)src\Razor\**\*.*proj;
$(RepositoryRoot)src\Mvc\**\*.*proj;
"
Exclude="
@(ProjectToExclude);
$(RepositoryRoot)**\bin\**\*;
$(RepositoryRoot)**\obj\**\*;" />
</ItemGroup>
<ProjectToBuild Include="@(NativeProjects)" Condition="'$(OS)' == 'Windows_NT'"/>
<ProjectToBuild Include="
$(RepositoryRoot)src\DefaultBuilder\**\*.*proj;
$(RepositoryRoot)src\Features\JsonPatch\**\*.*proj;
$(RepositoryRoot)src\DataProtection\**\*.*proj;
$(RepositoryRoot)src\Antiforgery\**\*.*proj;
$(RepositoryRoot)src\Hosting\**\*.*proj;
$(RepositoryRoot)src\Http\**\*.*proj;
$(RepositoryRoot)src\Html\**\*.*proj;
$(RepositoryRoot)src\Servers\**\*.csproj;
$(RepositoryRoot)src\Servers\**\*.pkgproj;
$(RepositoryRoot)src\Security\**\*.*proj;
$(RepositoryRoot)src\Shared\**\*.*proj;
$(RepositoryRoot)src\Tools\**\*.*proj;
$(RepositoryRoot)src\Middleware\**\*.*proj;
$(RepositoryRoot)src\Razor\**\*.*proj;
$(RepositoryRoot)src\Mvc\**\*.*proj;
$(RepositoryRoot)src\Azure\**\*.*proj;
"
Exclude="
@(ProjectToExclude);
$(RepositoryRoot)**\bin\**\*;
$(RepositoryRoot)**\obj\**\*;" />
</ItemGroup>
</Otherwise>
</Choose>
<!-- Properties for publishing -->
<PropertyGroup>

1
build/submodules.props
View File

@ -45,7 +45,6 @@
</ItemGroup>
<ItemGroup>
<ShippedRepository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
<ShippedRepository Include="EntityFrameworkCore" />
<ShippedRepository Include="Identity" RootPath="$(RepositoryRoot)src\Identity\" />

166
eng/Baseline.Designer.props
View File

@ -24,28 +24,6 @@
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'dotnet-watch' AND '$(TargetFramework)' == 'netcoreapp2.1' " />
<!-- Package: Microsoft.AspNetCore-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore' ">
<BaselinePackageVersion>2.1.6</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.HostFiltering" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Routing" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="[2.1.2, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="[2.1.3, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="[2.1.3, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Console" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Debug" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Antiforgery-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Antiforgery' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@ -57,19 +35,6 @@
<BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Authentication-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.WebEncoders" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Abstractions' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@ -79,6 +44,26 @@
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Authentication.AzureAD.UI-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureAD.UI' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureAD.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Authentication.AzureADB2C.UI-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureADB2C.UI' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureADB2C.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Authentication.Cookies-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Cookies' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
@ -156,13 +141,18 @@
<BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="[5.2.0, )" />
<BaselinePackageReference Include="System.IdentityModel.Tokens.Jwt" Version="[5.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Authorization-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' ">
<!-- Package: Microsoft.AspNetCore.Authentication-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND '$(TargetFramework)' == 'netstandard2.0' ">
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.WebEncoders" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Authorization.Policy-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization.Policy' ">
@ -172,6 +162,14 @@
<BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[2.1.2, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Authorization-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Connections.Abstractions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' ">
<BaselinePackageVersion>2.1.3</BaselinePackageVersion>
@ -541,6 +539,18 @@
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Localization" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Mvc.Razor.Extensions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.Extensions' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.Extensions' AND '$(TargetFramework)' == 'net46' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="[2.1.2, )" />
<BaselinePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="[2.1.2, )" />
</ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.Extensions' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="[2.1.2, )" />
<BaselinePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="[2.1.2, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Mvc.Razor-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor' ">
<BaselinePackageVersion>2.1.3</BaselinePackageVersion>
@ -615,18 +625,6 @@
<BaselinePackageReference Include="Microsoft.AspNet.WebApi.Client" Version="[5.2.6, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Mvc.Razor.Extensions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.Extensions' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.Extensions' AND '$(TargetFramework)' == 'net46' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="[2.1.2, )" />
<BaselinePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="[2.1.2, )" />
</ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.Extensions' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="[2.1.2, )" />
<BaselinePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="[2.1.2, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Mvc-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc' ">
<BaselinePackageVersion>2.1.3</BaselinePackageVersion>
@ -661,13 +659,6 @@
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Razor-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Razor.Design-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor.Design' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
@ -687,6 +678,13 @@
<BaselinePackageReference Include="Microsoft.AspNetCore.Razor" Version="[2.1.2, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Razor-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Razor' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.ResponseCaching.Abstractions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCaching.Abstractions' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@ -747,6 +745,17 @@
<BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Server.HttpSys-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.HttpSys' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.HttpSys' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[4.5.0, )" />
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Server.IISIntegration-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
@ -852,17 +861,6 @@
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="[2.1.3, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Server.HttpSys-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.HttpSys' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.HttpSys' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[4.5.0, )" />
<BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.5.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Session-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Session' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@ -929,6 +927,28 @@
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
<BaselinePackageReference Include="System.Text.Encodings.Web" Version="[4.5.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore' ">
<BaselinePackageVersion>2.1.6</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.HostFiltering" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Routing" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="[2.1.2, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="[2.1.3, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="[2.1.3, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Console" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Debug" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.CodeAnalysis.Razor-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.CodeAnalysis.Razor' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
@ -952,6 +972,11 @@
<BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.1.1, )" />
<BaselinePackageReference Include="System.Buffers" Version="[4.5.0, )" />
</ItemGroup>
<!-- Package: Microsoft.Net.Sdk.Razor-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Sdk.Razor' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Sdk.Razor' AND '$(TargetFramework)' == 'netstandard2.0' " />
<!-- Package: Microsoft.Owin.Security.Interop-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Owin.Security.Interop' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
@ -960,9 +985,4 @@
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Owin.Security" Version="[3.0.1, )" />
</ItemGroup>
<!-- Package: Microsoft.Net.Sdk.Razor-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Sdk.Razor' ">
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Sdk.Razor' AND '$(TargetFramework)' == 'netstandard2.0' " />
</Project>

16
eng/Baseline.xml
View File

@ -9,10 +9,10 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="dotnet-sql-cache" Version="2.1.1" />
<Package Id="dotnet-user-secrets" Version="2.1.1" />
<Package Id="dotnet-watch" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore" Version="2.1.6" />
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Authentication.Core" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="2.1.2" />
@ -23,8 +23,9 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Authorization.Policy" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Cors" Version="2.1.1" />
@ -65,26 +66,27 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Formatters.Xml" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Localization" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.NodeServices" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Owin" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Razor" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Razor.Runtime" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Razor" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.ResponseCaching" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Routing" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.2" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
@ -92,7 +94,6 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Session" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.1.1" />
@ -100,8 +101,9 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore" Version="2.1.6" />
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.1.2" />
<Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" />
<Package Id="Microsoft.Owin.Security.Interop" Version="2.1.2" />
<Package Id="Microsoft.Net.Sdk.Razor" Version="2.1.2" />
<Package Id="Microsoft.Owin.Security.Interop" Version="2.1.2" />
</Baseline>

1
eng/Dependencies.props
View File

@ -54,6 +54,7 @@ and are generated based on the last package release.
<LatestPackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />

13
eng/ProjectReferences.props
View File

@ -58,10 +58,6 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authorization.Policy" ProjectPath="$(RepositoryRoot)src\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.CookiePolicy" ProjectPath="$(RepositoryRoot)src\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj" />
<ProjectReferenceProvider Include="Microsoft.Owin.Security.Interop" ProjectPath="$(RepositoryRoot)src\Security\Interop\src\Microsoft.Owin.Security.Interop.csproj" />
<ProjectReferenceProvider Include="dotnet-dev-certs" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-dev-certs\src\dotnet-dev-certs.csproj" />
<ProjectReferenceProvider Include="dotnet-sql-cache" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-sql-cache\src\dotnet-sql-cache.csproj" />
<ProjectReferenceProvider Include="dotnet-user-secrets" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-user-secrets\src\dotnet-user-secrets.csproj" />
<ProjectReferenceProvider Include="dotnet-watch" ProjectPath="$(RepositoryRoot)src\Tools\dotnet-watch\src\dotnet-watch.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" ProjectPath="$(RepositoryRoot)src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Cors" ProjectPath="$(RepositoryRoot)src\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Diagnostics.Abstractions" ProjectPath="$(RepositoryRoot)src\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj" />
@ -73,11 +69,14 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Localization.Routing" ProjectPath="$(RepositoryRoot)src\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Localization" ProjectPath="$(RepositoryRoot)src\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.MiddlewareAnalysis" ProjectPath="$(RepositoryRoot)src\Middleware\MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.NodeServices" ProjectPath="$(RepositoryRoot)src\Middleware\NodeServices\src\Microsoft.AspNetCore.NodeServices.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCompression" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Rewrite" ProjectPath="$(RepositoryRoot)src\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Session" ProjectPath="$(RepositoryRoot)src\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices.Extensions" ProjectPath="$(RepositoryRoot)src\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices" ProjectPath="$(RepositoryRoot)src\Middleware\SpaServices\src\Microsoft.AspNetCore.SpaServices.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.StaticFiles" ProjectPath="$(RepositoryRoot)src\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
<ProjectReferenceProvider Include="Microsoft.CodeAnalysis.Razor" ProjectPath="$(RepositoryRoot)src\Razor\CodeAnalysis.Razor\src\Microsoft.CodeAnalysis.Razor.csproj" />
@ -114,9 +113,7 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc" ProjectPath="$(RepositoryRoot)src\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TestCommon" ProjectPath="$(RepositoryRoot)src\Mvc\test\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.TestDiagnosticListener" ProjectPath="$(RepositoryRoot)src\Mvc\test\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.NodeServices" ProjectPath="$(RepositoryRoot)src\Middleware\NodeServices\src\Microsoft.AspNetCore.NodeServices.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.NodeServices.Sockets" ProjectPath="$(RepositoryRoot)src\Middleware\NodeServices.Sockets\src\Microsoft.AspNetCore.NodeServices.Sockets.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices" ProjectPath="$(RepositoryRoot)src\Middleware\SpaServices\src\Microsoft.AspNetCore.SpaServices.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices.Extensions" ProjectPath="$(RepositoryRoot)src\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureAD.UI\src\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" ProjectPath="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureADB2C.UI\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
</ItemGroup>
</Project>

2
eng/targets/ResolveReferences.targets
View File

@ -164,7 +164,7 @@
</Target>
<Target Name="_GetReferencesProvided" Returns="@(ProvidesReference)">
<ItemGroup Condition=" '$(IsImplementationProject)' == 'true' OR '$(IsProjectReferenceProvider)' == 'true' ">
<ItemGroup Condition=" '$(IsProjectReferenceProvider)' == 'true' ">
<ProvidesReference Include="$(AssemblyName)">
<ProjectFileRelativePath>$([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectFullPath)))</ProjectFileRelativePath>
</ProvidesReference>

9
run.ps1
View File

@ -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

56
src/AADIntegration/.editorconfig
View File

@ -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

43
src/AADIntegration/.gitignore vendored
View File

@ -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

79
src/AADIntegration/AADIntegration.sln
View File

@ -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

21
src/AADIntegration/Directory.Build.props
View File

@ -1,21 +0,0 @@
<Project>
<Import
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
<Import Project="version.props" />
<Import Project="build\dependencies.props" />
<Import Project="build\sources.props" />
<PropertyGroup>
<Product>Microsoft ASP.NET Core AAD Integration</Product>
<RepositoryUrl>https://github.com/aspnet/AspNetCore</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\eng\AspNetCore.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
</Project>

7
src/AADIntegration/Directory.Build.targets
View File

@ -1,7 +0,0 @@
<Project>
<PropertyGroup>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
</PropertyGroup>
</Project>

23
src/AADIntegration/NuGetPackageVerifier.json
View File

@ -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."
}
}
}
}
}
}

14
src/AADIntegration/README.md
View File

@ -1,14 +0,0 @@
ASP.NET Core Azure Active Directory Integration
===
<!-- AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/969jbosi0qwc1awg/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/aadintegration/branch/dev)
Travis: [![Travis](https://travis-ci.org/aspnet/AADIntegration.svg?branch=dev)](https://travis-ci.org/aspnet/aadintegration) -->
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.

455
src/AADIntegration/Settings.StyleCop
View File

@ -1,455 +0,0 @@
<StyleCopSettings Version="105">
<GlobalSettings>
<StringProperty Name="MergeSettingsFiles">NoMerge</StringProperty>
</GlobalSettings>
<Parsers>
<Parser ParserId="StyleCop.CSharp.CsParser">
<ParserSettings>
<BooleanProperty Name="AnalyzeDesignerFiles">False</BooleanProperty>
</ParserSettings>
</Parser>
</Parsers>
<Analyzers>
<Analyzer AnalyzerId="StyleCop.CSharp.NamingRules">
<Rules>
<Rule Name="ConstFieldNamesMustBeginWithUpperCaseLetter">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="FieldNamesMustNotBeginWithUnderscore">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="FieldNamesMustNotUseHungarianNotation">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="StaticReadonlyFieldsMustBeginWithUpperCaseLetter">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
</Rules>
<AnalyzerSettings>
<CollectionProperty Name="Hungarian">
<Value>as</Value>
<Value>db</Value>
<Value>dc</Value>
<Value>do</Value>
<Value>ef</Value>
<Value>id</Value>
<Value>if</Value>
<Value>in</Value>
<Value>is</Value>
<Value>my</Value>
<Value>no</Value>
<Value>on</Value>
<Value>sl</Value>
<Value>to</Value>
<Value>ui</Value>
<Value>vs</Value>
</CollectionProperty>
</AnalyzerSettings>
</Analyzer>
<Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
<Rules>
<Rule Name="FileMustHaveHeader">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="FileHeaderMustContainFileName">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="FileHeaderFileNameDocumentationMustMatchFileName">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="FileHeaderMustHaveValidCompanyText">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ConstructorSummaryDocumentationMustBeginWithStandardText">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="DestructorSummaryDocumentationMustBeginWithStandardText">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="DocumentationHeadersMustNotContainBlankLines">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementsMustBeDocumented">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="PartialElementsMustBeDocumented">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="EnumerationItemsMustBeDocumented">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="DocumentationMustContainValidXml">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementDocumentationMustHaveSummary">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="PartialElementDocumentationMustHaveSummary">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementDocumentationMustHaveSummaryText">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="PartialElementDocumentationMustHaveSummaryText">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementDocumentationMustNotHaveDefaultSummary">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementParametersMustBeDocumented">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementParameterDocumentationMustMatchElementParameters">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementParameterDocumentationMustDeclareParameterName">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementParameterDocumentationMustHaveText">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementReturnValueMustBeDocumented">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementReturnValueDocumentationMustHaveText">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="VoidReturnValueMustNotBeDocumented">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="GenericTypeParametersMustBeDocumented">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="GenericTypeParametersMustBeDocumentedPartialClass">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="GenericTypeParameterDocumentationMustMatchTypeParameters">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="GenericTypeParameterDocumentationMustDeclareParameterName">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="GenericTypeParameterDocumentationMustHaveText">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="PropertySummaryDocumentationMustMatchAccessors">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="PropertySummaryDocumentationMustOmitSetAccessorWithRestrictedAccess">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementDocumentationMustNotBeCopiedAndPasted">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="SingleLineCommentsMustNotUseDocumentationStyleSlashes">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="DocumentationTextMustNotBeEmpty">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="DocumentationTextMustContainWhitespace">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="DocumentationMustMeetCharacterPercentage">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="IncludedDocumentationXPathDoesNotExist">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="IncludeNodeDoesNotContainValidFileAndPath">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="InheritDocMustBeUsedWithInheritingClass">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="FileHeaderMustShowCopyright">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="FileHeaderMustHaveCopyrightText">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="FileHeaderFileNameDocumentationMustMatchTypeName">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
</Rules>
<AnalyzerSettings>
<BooleanProperty Name="IgnorePrivates">True</BooleanProperty>
<BooleanProperty Name="IgnoreInternals">True</BooleanProperty>
</AnalyzerSettings>
</Analyzer>
<Analyzer AnalyzerId="StyleCop.CSharp.ReadabilityRules">
<Rules>
<Rule Name="OpeningParenthesisMustBeOnDeclarationLine">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ParameterMustNotSpanMultipleLines">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="UseStringEmptyForEmptyStrings">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="PrefixCallsCorrectly">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="PrefixLocalCallsWithThis">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ParameterMustFollowComma">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="SplitParametersMustStartOnLineAfterDeclaration">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ParametersMustBeOnSameLineOrSeparateLines">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="UseBuiltInTypeAlias">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
</Rules>
<AnalyzerSettings />
</Analyzer>
<Analyzer AnalyzerId="Microsoft.Web.StyleCop.Rules">
<AnalyzerSettings>
<StringProperty Name="FileHeaderText"> Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.</StringProperty>
</AnalyzerSettings>
</Analyzer>
<Analyzer AnalyzerId="StyleCop.CSharp.LayoutRules">
<Rules>
<Rule Name="AllAccessorsMustBeMultiLineOrSingleLine">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="SingleLineCommentsMustNotBeFollowedByBlankLine">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ClosingCurlyBracketMustBeFollowedByBlankLine">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="SingleLineCommentMustBePrecededByBlankLine">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementsMustBeSeparatedByBlankLine">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
</Rules>
<AnalyzerSettings />
</Analyzer>
<Analyzer AnalyzerId="StyleCop.CSharp.MaintainabilityRules">
<Rules>
<Rule Name="ConditionalExpressionsMustDeclarePrecedence">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="FieldsMustBePrivate">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="DebugAssertMustProvideMessageText">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="StatementMustNotUseUnnecessaryParenthesis">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
</Rules>
<AnalyzerSettings />
</Analyzer>
<Analyzer AnalyzerId="StyleCop.CSharp.OrderingRules">
<Rules>
<Rule Name="UsingDirectivesMustBePlacedWithinNamespace">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementsMustAppearInTheCorrectOrder">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ElementsMustBeOrderedByAccess">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ConstantsMustAppearBeforeFields">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="InstanceReadonlyElementsMustAppearBeforeInstanceNonReadonlyElements">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="StaticElementsMustAppearBeforeInstanceElements">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="StaticReadonlyElementsMustAppearBeforeStaticNonReadonlyElements">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
</Rules>
<AnalyzerSettings />
</Analyzer>
<Analyzer AnalyzerId="StyleCop.CSharp.SpacingRules">
<Rules>
<Rule Name="SingleLineCommentsMustBeginWithSingleSpace">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<!-- Creates a lot of noise with anonymous objects -->
<Rule Name="OpeningCurlyBracketsMustBeSpacedCorrectly">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
<Rule Name="ClosingCurlyBracketsMustBeSpacedCorrectly">
<RuleSettings>
<BooleanProperty Name="Enabled">False</BooleanProperty>
</RuleSettings>
</Rule>
</Rules>
<AnalyzerSettings />
</Analyzer>
<Analyzer AnalyzerId="StyleCop.KRules.FileHeaderRule">
<Rules />
<AnalyzerSettings>
<StringProperty Name="FileHeaderText"> 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.</StringProperty>
</AnalyzerSettings>
</Analyzer>
<Analyzer AnalyzerId="StyleCop.KRules.LineLengthRule">
<Rules />
<AnalyzerSettings>
<IntegerProperty Name="LineLength">120</IntegerProperty>
</AnalyzerSettings>
</Analyzer>
</Analyzers>
</StyleCopSettings>

47
src/AADIntegration/build/dependencies.props
View File

@ -1,47 +0,0 @@
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<!-- These package versions may be overridden or updated by automation. -->
<PropertyGroup Label="Package Versions: Auto">
<InternalAspNetCoreSdkPackageVersion>2.1.3-rtm-15802</InternalAspNetCoreSdkPackageVersion>
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
<MicrosoftNETCoreApp21PackageVersion>2.1.2</MicrosoftNETCoreApp21PackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
<MoqPackageVersion>4.7.49</MoqPackageVersion>
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
<XunitAnalyzersPackageVersion>0.8.0</XunitAnalyzersPackageVersion>
<XunitPackageVersion>2.3.1</XunitPackageVersion>
<XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion>
</PropertyGroup>
<!-- This may import a generated file which may override the variables above. -->
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
<!-- These are package versions that should not be overridden or updated by automation. -->
<PropertyGroup Label="Package Versions: Pinned">
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
<MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
<MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>2.1.1</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>2.1.1</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>
<MicrosoftAspNetCoreHostingPackageVersion>2.1.1</MicrosoftAspNetCoreHostingPackageVersion>
<MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.1.1</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
<MicrosoftAspNetCoreMvcPackageVersion>2.1.1</MicrosoftAspNetCoreMvcPackageVersion>
<MicrosoftAspNetCoreMvcTestingPackageVersion>2.1.1</MicrosoftAspNetCoreMvcTestingPackageVersion>
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.1</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
<MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>2.1.2</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
<MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.2</MicrosoftAspNetCoreServerKestrelPackageVersion>
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.1</MicrosoftAspNetCoreStaticFilesPackageVersion>
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.1.1</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.1.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>2.1.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>2.1.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<MicrosoftExtensionsLoggingConfigurationPackageVersion>2.1.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>2.1.1</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>2.1.1</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsLoggingTestingPackageVersion>2.1.1</MicrosoftExtensionsLoggingTestingPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.1.1</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>
</Project>

8
src/AADIntegration/build/repo.props
View File

@ -1,8 +0,0 @@
<Project>
<Import Project="dependencies.props" />
<ItemGroup>
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
</ItemGroup>
</Project>

17
src/AADIntegration/build/sources.props
View File

@ -1,17 +0,0 @@
<Project>
<Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
<PropertyGroup Label="RestoreSources">
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
$(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>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
$(RestoreSources);
https://api.nuget.org/v3/index.json;
</RestoreSources>
</PropertyGroup>
</Project>

27
src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj
View File

@ -1,27 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(DeveloperBuild)' != 'true' ">$(TargetFrameworks);netcoreapp2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<RazorCompileOnBuild>true</RazorCompileOnBuild>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="$(MicrosoftAspNetCoreHttpsPolicyPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
</ItemGroup>
</Project>

27
src/AADIntegration/samples/AzureADB2CSample/Properties/launchSettings.json
View File

@ -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/"
}
}
}

7
src/AADIntegration/src/Directory.Build.props
View File

@ -1,7 +0,0 @@
<Project>
<Import Project="..\Directory.Build.props" />
<ItemGroup>
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
</ItemGroup>
</Project>

25
src/AADIntegration/test/Directory.Build.props
View File

@ -1,25 +0,0 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
<StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.1;netcoreapp2.0</StandardTestTfms>
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
</PropertyGroup>
<PropertyGroup>
<IsPackable>false</IsPackable>
<WarningsNotAsErrors>xUnit1026:$(WarningsNotAsErrors)</WarningsNotAsErrors>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)AADIntegration.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
<PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
</ItemGroup>
</Project>

21
src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
View File

@ -1,21 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<PlatformTarget Condition=" '$(TargetFramework)' == 'netcoreapp2.1' "></PlatformTarget>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\WebSites\AzureAD.WebSite\AzureAD.WebSite.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(MicrosoftAspNetCoreMvcTestingPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
</ItemGroup>
</Project>

28
src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj
View File

@ -1,28 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="$(MicrosoftAspNetCoreAuthorizationPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="$(MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="$(MicrosoftAspNetCoreServerKestrelHttpsPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Authentication.AzureAD.UI\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
</ItemGroup>
</Project>

11
src/AADIntegration/test/WebSites/Directory.Build.props
View File

@ -1,11 +0,0 @@
<Project>
<!-- Skip the parent directory so test websites do not get the test package references. -->
<Import Project="..\..\Directory.Build.props" />
<PropertyGroup>
<DeveloperBuildTestWebsiteTfms>netcoreapp2.1</DeveloperBuildTestWebsiteTfms>
<StandardTestWebsiteTfms>$(DeveloperBuildTestWebsiteTfms)</StandardTestWebsiteTfms>
<StandardTestWebsiteTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestWebsiteTfms);netcoreapp2.0</StandardTestWebsiteTfms>
<StandardTestWebsiteTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestWebsiteTfms);net461</StandardTestWebsiteTfms>
</PropertyGroup>
</Project>

12
src/AADIntegration/version.props
View File

@ -1,12 +0,0 @@
<Project>
<PropertyGroup>
<VersionPrefix>2.1.1</VersionPrefix>
<ExperimentalProjectVersionPrefix>0.4.1</ExperimentalProjectVersionPrefix>
<VersionSuffix>rtm</VersionSuffix>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup>
</Project>

284
src/Azure/Azure.sln Normal file
View File

@ -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

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Controllers/AccountController.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Controllers/AccountController.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/Error.cshtml.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/Account/_viewImports.cshtml → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Areas/AzureAD/Pages/_ViewStart.cshtml → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAccountControllerFeatureProvider.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAccountControllerFeatureProvider.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADAuthenticationBuilderExtensions.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADDefaults.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADDefaults.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptions.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptions.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADOptionsConfiguration.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOptionsConfiguration.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/AzureADSchemeOptions.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADSchemeOptions.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/CookieOptionsConfiguration.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/CookieOptionsConfiguration.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/JwtBearerOptionsConfiguration.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/JwtBearerOptionsConfiguration.cs
View File

13
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
View File

@ -10,11 +10,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" />
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
<Reference Include="Microsoft.AspNetCore.Mvc" />
<Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
<Reference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
</ItemGroup>
<ItemGroup>
@ -28,10 +27,10 @@
<_Parameter2>$(BuildNumber)</_Parameter2>
</RazorTargetAssemblyAttribute>
</ItemGroup>
<ItemGroup>
<RazorCompile Include="$(GeneratedCommitHashAttributeFile)" />
<RazorCompile Include="$(GeneratedInternalAspNetCoreAttributeFile)" />
</ItemGroup>
</Project>

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/OpenIdConnectOptionsConfiguration.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/OpenIdConnectOptionsConfiguration.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Properties/AssemblyInfo.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/src/Properties/AssemblyInfo.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/baseline.netcore.json → src/Azure/AzureAD/Authentication.AzureAD.UI/src/baseline.netcore.json
View File

0
src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/AzureADAuthenticationBuilderExtensionsTests.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
View File

0
src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Controllers/AccountControllerTests.cs → src/Azure/AzureAD/Authentication.AzureAD.UI/test/Controllers/AccountControllerTests.cs
View File

4
src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj → src/Azure/AzureAD/Authentication.AzureAD.UI/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
<RootNamespace>Microsoft.AspNetCore.Authentication.AzureAD.UI</RootNamespace>
</PropertyGroup>
@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.AzureAD.UI\Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj" />
<Reference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" />
</ItemGroup>
</Project>

0
src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/xunit.runner.json → src/Azure/AzureAD/Authentication.AzureAD.UI/test/xunit.runner.json
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Controllers/AccountController.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Controllers/AccountController.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Areas/AzureADB2C/Pages/_ViewStart.cshtml → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureADB2CAccountControllerFeatureProvider.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureADB2CAccountControllerFeatureProvider.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CAuthenticationBuilderExtensions.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CAuthenticationBuilderExtensions.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CDefaults.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CDefaults.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COpenIDConnectEventHandlers.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COpenIDConnectEventHandlers.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptions.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptions.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2COptionsConfiguration.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2COptionsConfiguration.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/AzureAdB2CSchemeOptions.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/AzureAdB2CSchemeOptions.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/CookieOptionsConfiguration.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/CookieOptionsConfiguration.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/JwtBearerOptionsConfiguration.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/JwtBearerOptionsConfiguration.cs
View File

13
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
View File

@ -10,11 +10,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" />
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
<Reference Include="Microsoft.AspNetCore.Mvc" />
<Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
<Reference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
</ItemGroup>
<ItemGroup>
@ -28,10 +27,10 @@
<_Parameter2>$(BuildNumber)</_Parameter2>
</RazorTargetAssemblyAttribute>
</ItemGroup>
<ItemGroup>
<RazorCompile Include="$(GeneratedCommitHashAttributeFile)" />
<RazorCompile Include="$(GeneratedInternalAspNetCoreAttributeFile)" />
</ItemGroup>
</Project>

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/OpenIdConnectOptionsConfiguration.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/OpenIdConnectOptionsConfiguration.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Properties/AssemblyInfo.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Properties/AssemblyInfo.cs
View File

0
src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/baseline.netcore.json → src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/baseline.netcore.json
View File

0
src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2CAuthenticationBuilderExtensionsTests.cs
View File

0
src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/AzureAdB2COpenIDConnectEventHandlersTests.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/AzureAdB2COpenIDConnectEventHandlersTests.cs
View File

0
src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Controllers/AccountControllerTests.cs → src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Controllers/AccountControllerTests.cs
View File

4
src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj → src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
<RootNamespace>Microsoft.AspNetCore.Authentication.AzureADB2C.UI</RootNamespace>
</PropertyGroup>
@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
<Reference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" />
</ItemGroup>
</Project>

0
src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/xunit.runner.json → src/Azure/AzureAD/Authentication.AzureADB2C.UI/test/xunit.runner.json
View File

4
src/AADIntegration/test/AADIntegration.ruleset → src/Azure/AzureAD/AzureAD.ruleset
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RuleSet Name="Rules for MVC Tests" Description="Code analysis rules for MVC Tests" ToolsVersion="15.0">
<RuleSet Name="Rules for AzureAD tests" Description="Code analysis rules for AzureAD tests" ToolsVersion="15.0">
<Rules AnalyzerId="xunit.analyzers" RuleNamespace="xunit.analyzers">
<!--
<!--
This code is produced when theory parameters that are unused. Normally, this is a warning which causes our build to fail.
-->
<Rule Id="xUnit1026" Action="Info" />

8
src/Azure/AzureAD/Directory.Build.props Normal file
View File

@ -0,0 +1,8 @@
<Project>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<WarningsNotAsErrors>xUnit1026:$(WarningsNotAsErrors)</WarningsNotAsErrors>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)AzureAD.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
</Project>

4
src/Azure/AzureAD/README.md Normal file
View File

@ -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.

22
src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj Normal file
View File

@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<RazorCompileOnBuild>true</RazorCompileOnBuild>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" />
<Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
<Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.AspNetCore.StaticFiles" />
<Reference Include="Microsoft.Extensions.Configuration.Json" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
<Reference Include="Microsoft.Extensions.Logging.Debug" />
</ItemGroup>
</Project>

0
src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml → src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml
View File

0
src/AADIntegration/samples/AzureADB2CSample/Pages/Index.cshtml.cs → src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml.cs
View File

0
src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml → src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_Layout.cshtml
View File

0
src/AADIntegration/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml → src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml
View File

0
src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewImports.cshtml → src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml
View File

0
src/AADIntegration/samples/AzureADB2CSample/Pages/_ViewStart.cshtml → src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewStart.cshtml
View File

0
src/AADIntegration/samples/AzureADB2CSample/Program.cs → src/Azure/AzureAD/samples/AzureADB2CSample/Program.cs
View File

0
src/AADIntegration/samples/AzureADB2CSample/Startup.cs → src/Azure/AzureAD/samples/AzureADB2CSample/Startup.cs
View File

0
src/AADIntegration/samples/AzureADB2CSample/appsettings.Development.json → src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.Development.json
View File

0
src/AADIntegration/samples/AzureADB2CSample/appsettings.json → src/Azure/AzureAD/samples/AzureADB2CSample/appsettings.json
View File

0
src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.css → src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.css
View File

0
src/AADIntegration/samples/AzureADB2CSample/wwwroot/css/site.min.css → src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/css/site.min.css vendored
View File

0
src/AADIntegration/samples/AzureADB2CSample/wwwroot/favicon.ico → src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/favicon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

0
src/AADIntegration/samples/AzureADB2CSample/wwwroot/images/banner1.svg → src/Azure/AzureAD/samples/AzureADB2CSample/wwwroot/images/banner1.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Some files were not shown because too many files have changed in this diff Show More