Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix load wpf assembly fail in dotnet 6 #8950

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix load wpf assembly fail in dotnet 6 #8950

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions source/dotnet/Library/AdaptiveCards.Rendering.Wpf/AdaptiveCardRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,16 @@ public ResourceDictionary Resources
// Wrap this to avoid Console applications to crash because of this : https://github.com/Microsoft/AdaptiveCards/issues/2121
try
{
#if NET6_0_OR_GREATER
const string assembly = "AdaptiveCards.Rendering.Wpf.Net6";
#else
const string assembly = "AdaptiveCards.Rendering.Wpf";
#endif
var source = new Uri($"/{assembly};component/Themes/generic.xaml",
UriKind.RelativeOrAbsolute);
var resource = new ResourceDictionary
{
Source = new Uri("/AdaptiveCards.Rendering.Wpf;component/Themes/generic.xaml",
UriKind.RelativeOrAbsolute)
Source = source
};
_resources.MergedDictionaries.Add(resource);
}
Expand Down