From 594b5fafe44efdfa3bc320fd2e3e84967541b911 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 27 Sep 2018 15:04:18 -0700
Subject: [PATCH 1/2] Enable MicroBuild code signing

---
 Directory.Build.props                                   | 3 ---
 src/UI/Microsoft.AspNetCore.Identity.UI.csproj          | 2 +-
 src/UI/{THIRD-PARTY-NOTICES => THIRD-PARTY-NOTICES.txt} | 0
 3 files changed, 1 insertion(+), 4 deletions(-)
 rename src/UI/{THIRD-PARTY-NOTICES => THIRD-PARTY-NOTICES.txt} (100%)

diff --git a/Directory.Build.props b/Directory.Build.props
index 7a721968..1c9369f9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,9 +14,6 @@
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <AssemblySigningCertName>Microsoft</AssemblySigningCertName>
-    <PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName>
-    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <!-- Workaround microsoft/msbuild#3626 -->
     <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
diff --git a/src/UI/Microsoft.AspNetCore.Identity.UI.csproj b/src/UI/Microsoft.AspNetCore.Identity.UI.csproj
index 69ee3f02..7631fb16 100644
--- a/src/UI/Microsoft.AspNetCore.Identity.UI.csproj
+++ b/src/UI/Microsoft.AspNetCore.Identity.UI.csproj
@@ -20,7 +20,7 @@
     <EmbeddedResource Remove="wwwroot/**/LICENSE*" />
     <None Remove="wwwroot/**/.bower.json" />
     <None Remove="wwwroot/**/LICENSE*" />
-    <None Include="THIRD-PARTY-NOTICES" Pack="true" PackagePath="/" />
+    <None Include="THIRD-PARTY-NOTICES.txt" Pack="true" PackagePath="/" />
 
     <Content Update="**\*.cshtml" Pack="false" />
   </ItemGroup>
diff --git a/src/UI/THIRD-PARTY-NOTICES b/src/UI/THIRD-PARTY-NOTICES.txt
similarity index 100%
rename from src/UI/THIRD-PARTY-NOTICES
rename to src/UI/THIRD-PARTY-NOTICES.txt

From 73062c89f6a6789cdd9c4a8fbbea9331f44a809a Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 27 Sep 2018 16:40:38 -0700
Subject: [PATCH 2/2] Change spec test packages to depend on
 xunit.execution.core, not the xunit metapackage (#1979)

---
 build/dependencies.props                                      | 2 ++
 ...oft.AspNetCore.Identity.Service.Specification.Tests.csproj | 4 +++-
 .../Microsoft.AspNetCore.Identity.Specification.Tests.csproj  | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 0e48c7bc..14c59ff4 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -70,6 +70,8 @@
     <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
     <SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion>
     <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
+    <XunitAssertPackageVersion>2.3.1</XunitAssertPackageVersion>
+    <XunitExtensibilityCorePackageVersion>2.3.1</XunitExtensibilityCorePackageVersion>
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
diff --git a/src/Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj b/src/Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
index f6975aea..8a9417cd 100644
--- a/src/Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
+++ b/src/Service.Specification.Tests/Microsoft.AspNetCore.Identity.Service.Specification.Tests.csproj
@@ -20,7 +20,9 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.assert" Version="$(XunitAssertPackageVersion)" />
+    <PackageReference Include="xunit.extensibility.core" Version="$(XunitExtensibilityCorePackageVersion)" />
+    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
index c987d8fa..3194032c 100644
--- a/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
+++ b/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj
@@ -16,7 +16,9 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.assert" Version="$(XunitAssertPackageVersion)" />
+    <PackageReference Include="xunit.extensibility.core" Version="$(XunitExtensibilityCorePackageVersion)" />
+    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>