diff --git a/.vscode/launch.json b/.vscode/launch.json index 5589dcd55..f208d5730 100644 --- 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 index ec9d372c9..3724ca2ac 100755 --- 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);