From 1fd33f62f4e095aa1fd8837c8195a1037fff9323 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Tue, 13 Mar 2018 14:57:07 -0700
Subject: [PATCH 1/2] Skip flaky tests

---
 test/Service.Core.Test/JwtIdTokenIssuerTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Service.Core.Test/JwtIdTokenIssuerTest.cs b/test/Service.Core.Test/JwtIdTokenIssuerTest.cs
index 20e4bfd9e7..8fc7314d0c 100644
--- a/test/Service.Core.Test/JwtIdTokenIssuerTest.cs
+++ b/test/Service.Core.Test/JwtIdTokenIssuerTest.cs
@@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Identity.Service
             Assert.Equal($"Missing '{IdentityServiceClaimTypes.ClientId}' claim from the application.", exception.Message);
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/Identity/issues/1630")]
         public async Task JwtIdTokenIssuer_SignsAccessToken()
         {
             // Arrange
@@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Identity.Service
             Assert.Equal(expectedDateTime.UtcDateTime, jwtToken.ValidFrom);
         }
 
-        [Theory(Skip="https://github.com/aspnet/Identity/issues/1630")]
+        [Theory(Skip = "https://github.com/aspnet/Identity/issues/1630")]
         [InlineData(null, null, null)]
         [InlineData("nonce", null, null)]
         [InlineData("nonce", "code", null)]

From f1abe24c7681a9e4e8314d87a26f566e74d171eb Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 22 Mar 2018 16:50:57 -0700
Subject: [PATCH 2/2] React to Mvc changes

---
 build/dependencies.props                       | 4 ++--
 src/UI/IdentityBuilderUIExtensions.cs          | 6 ++++--
 src/UI/Microsoft.AspNetCore.Identity.UI.csproj | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 6bad2ab449..b625e8781a 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -21,9 +21,9 @@
     <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
     <MicrosoftAspNetCoreHttpPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreHttpPackageVersion>
     <MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
-    <MicrosoftAspNetCoreMvcPackageVersion>2.1.0-a-preview2-application-part-18617</MicrosoftAspNetCoreMvcPackageVersion>
+    <MicrosoftAspNetCoreMvcPackageVersion>2.1.0-a-preview2-app-part-18627</MicrosoftAspNetCoreMvcPackageVersion>
     <MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
-    <MicrosoftAspNetCoreMvcTestingPackageVersion>2.1.0-a-preview2-application-part-18617</MicrosoftAspNetCoreMvcTestingPackageVersion>
+    <MicrosoftAspNetCoreMvcTestingPackageVersion>2.1.0-a-preview2-app-part-18627</MicrosoftAspNetCoreMvcTestingPackageVersion>
     <MicrosoftAspNetCoreRazorDesignPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreRazorDesignPackageVersion>
     <MicrosoftAspNetCoreRewritePackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreRewritePackageVersion>
     <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
diff --git a/src/UI/IdentityBuilderUIExtensions.cs b/src/UI/IdentityBuilderUIExtensions.cs
index fd65649772..33193dd8d6 100644
--- a/src/UI/IdentityBuilderUIExtensions.cs
+++ b/src/UI/IdentityBuilderUIExtensions.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Linq;
 using Microsoft.AspNetCore.Identity.UI;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
@@ -54,10 +55,11 @@ namespace Microsoft.AspNetCore.Identity
                 {
                     var thisAssembly = typeof(IdentityBuilderUIExtensions).Assembly;
                     var relatedAssemblies = RelatedAssemblyAttribute.GetRelatedAssemblies(thisAssembly, throwOnError: true);
+                    var relatedParts = relatedAssemblies.SelectMany(CompiledRazorAssemblyApplicationPartFactory.GetDefaultApplicationParts);
 
-                    foreach (var assembly in relatedAssemblies)
+                    foreach (var part in relatedParts)
                     {
-                        partManager.ApplicationParts.Add(new CompiledRazorAssemblyPart(assembly));
+                        partManager.ApplicationParts.Add(part);
                     }
                 });
         }
diff --git a/src/UI/Microsoft.AspNetCore.Identity.UI.csproj b/src/UI/Microsoft.AspNetCore.Identity.UI.csproj
index 7e75bee44d..e81d9c1a8d 100644
--- a/src/UI/Microsoft.AspNetCore.Identity.UI.csproj
+++ b/src/UI/Microsoft.AspNetCore.Identity.UI.csproj
@@ -8,7 +8,7 @@
     <PackageTags>aspnetcore;identity;membership;razorpages</PackageTags>
     <EnableApiCheck>false</EnableApiCheck>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-    <EnableDefaultCompiledViewAssemblyLoadBehavior>false</EnableDefaultCompiledViewAssemblyLoadBehavior>
+    <ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
   </PropertyGroup>
 
   <ItemGroup>