Merge pull request #2718 from cwensley/curtis/wpf-use-token-instead-o…

…f-full-public-key Wpf: Use public key token for WPF resources instead of full key
picoe · Dec 28, 2024 · aeff343 · aeff343
2 parents 802488c + 862204a
commit aeff343
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -98,6 +98,7 @@
 			"request": "launch",
 			"preLaunchTask": "build-wpf",
             "program": "${workspaceFolder}/artifacts/test/Eto.Test.Wpf/${config:var.configuration}/net48/Eto.Test.Wpf.exe",
+			"targetArchitecture": "x86_64",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart",

diff --git a/src/Eto.Wpf/AssemblyAbsoluteResourceDictionary.cs b/src/Eto.Wpf/AssemblyAbsoluteResourceDictionary.cs
@@ -19,7 +19,7 @@ internal static Uri GetAbsolutePackUri(string path, string assemblyName = null)
 
 			var version = "v" + name.Version.ToString() + ";";
 
-			var publicKey = name.GetPublicKey();
+			var publicKey = name.GetPublicKeyToken();
 			var publicKeyString = publicKey?.Length > 0 ? BitConverter.ToString(publicKey).Replace("-", "") + ";" : null;
 
 			return new Uri($"pack://application:,,,/{name.Name};{version}{publicKeyString}component/{path}", UriKind.Absolute);