From 96c171da4e1e6887cf31384dab84792628ff3074 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <jestedfa@microsoft.com>
Date: Tue, 20 Feb 2024 19:08:31 -0500
Subject: [PATCH] Strong-name fixes

* Stop strong-naming the Microsoft.Xaml.Behaviors.dll using the
  Behaviors.snk. The released NuGets always use FinalPublicKey.snk,
  so make sure to use that always.
* Renamed src/Behaviors.snk to Tests/UnitTests.snk so it's less confusing
* Updated UnitTests.csproj to use the newly named UnitTests.snk
* Removed properties that only affected UnitTests.csproj from the
  Directory.Build.props
---
 Directory.Build.props                        |   2 --
 src/Behaviors.snk => Test/UnitTests.snk      | Bin
 Test/UnitTests/UnitTests.csproj              |   2 ++
 src/Microsoft.Xaml.Behaviors/AssemblyInfo.cs |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Behaviors.snk => Test/UnitTests.snk (100%)

diff --git a/Directory.Build.props b/Directory.Build.props
index ed0e0d9..3a85ea0 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\src\Behaviors.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Behaviors.snk b/Test/UnitTests.snk
similarity index 100%
rename from src/Behaviors.snk
rename to Test/UnitTests.snk
diff --git a/Test/UnitTests/UnitTests.csproj b/Test/UnitTests/UnitTests.csproj
index 3d8c012..635b46a 100644
--- a/Test/UnitTests/UnitTests.csproj
+++ b/Test/UnitTests/UnitTests.csproj
@@ -6,6 +6,8 @@
     <OutputType>Library</OutputType>
     <AssemblyName>UnitTests</AssemblyName>
     <RootNamespace>UnitTests</RootNamespace>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\UnitTests.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Xaml.Behaviors/AssemblyInfo.cs b/src/Microsoft.Xaml.Behaviors/AssemblyInfo.cs
index 411d480..12d4e3e 100644
--- a/src/Microsoft.Xaml.Behaviors/AssemblyInfo.cs
+++ b/src/Microsoft.Xaml.Behaviors/AssemblyInfo.cs
@@ -39,6 +39,6 @@
 
 [assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Microsoft.Xaml.Behaviors")]
 
-[assembly: AssemblyKeyFile("..\\Behaviors.snk")]
+[assembly: AssemblyKeyFile("..\\FinalPublicKey.snk")]
 [assembly: AssemblyDelaySign(true)]
 [assembly: InternalsVisibleTo("UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e5435599803109fe684072f487ec0670f2766325a25d47089633ffb5d9a56bf115a705bc0632660aeecfe00248951540865f481613845080859feafc5d9b55750395e7ca4c2124136d17bc9e73f0371d802fc2c9e8308f6f8b0ab3096661d2d1b0cbbbcb6de3fe711ef415f29271088537081b09ad1ee08ce8020b22031cdebd")]