Merge branch 'release/2.1' into release/2.2

aspnet · Oct 30, 2018 · 9405d05 · 9405d05
2 parents 6c45bfc + fa3cfd0
commit 9405d05
Show file tree

Hide file tree

Showing 549 changed files with 0 additions and 93,182 deletions.
diff --git a/Identity.sln b/Identity.sln
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -33,7 +33,6 @@
     <MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreTestHostPackageVersion>
     <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview3-35425</MicrosoftAspNetCoreTestingPackageVersion>
     <MicrosoftAspNetIdentityEntityFrameworkPackageVersion>2.2.1</MicrosoftAspNetIdentityEntityFrameworkPackageVersion>
-    <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion>
     <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.0-preview3-35425</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
     <MicrosoftEntityFrameworkCoreRelationalPackageVersion>2.2.0-preview3-35425</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
     <MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.2.0-preview3-35425</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
@@ -57,8 +56,6 @@
     <MicrosoftExtensionsOptionsPackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsOptionsPackageVersion>
     <MicrosoftExtensionsRazorViewsSourcesPackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsRazorViewsSourcesPackageVersion>
     <MicrosoftExtensionsSecurityHelperSourcesPackageVersion>2.2.0-preview3-35425</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
-    <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.14.2</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
-    <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.2.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
     <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
     <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
     <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview3-27001-02</MicrosoftNETCoreApp22PackageVersion>

diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/AccountController.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/AccountController.cs
diff --git a/...les/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/ApplicationsController.cs b/...les/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/ApplicationsController.cs
diff --git a/...WebApplicationSample/Areas/Identity/Controllers/IdentityServiceConfigurationController.cs b/...WebApplicationSample/Areas/Identity/Controllers/IdentityServiceConfigurationController.cs
diff --git a/.../IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/IdentityServiceController.cs b/.../IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/IdentityServiceController.cs