Merge pull request #284 from MartinZikmund/feature/workaround-webview2

MartinZikmund · Aug 11, 2024 · 0762ddb · 0762ddb
2 parents 33f6902 + ab3c811
commit 0762ddb
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,2 +1,5 @@
 <Project>
+	<!-- Workaround for https://github.com/unoplatform/uno/issues/17910 -->
+	<Target Name="ResolveWebView2CoreDuplicates1" BeforeTargets="_ComputeResolvedFilesToPublishTypes" AfterTargets="ComputeFilesToPublish" />
+	<Target Name="ResolveWebView2CoreDuplicates2" BeforeTargets="_ComputeResolvedFilesToPublishTypes" AfterTargets="ComputeFilesToPublish" />
 </Project>
diff --git a/src/app/MZikmund.App/Assets/PostPreviewTemplate.html b/src/app/MZikmund.App/Assets/PostPreviewTemplate.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en" data-bs-theme="{ACTUALTHEME}">
+<head>
+
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
+<link rel="stylesheet" href="https://mzikmund.dev/css/site.min.css" />
+<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
+<script src="https://mzikmund.dev/js/site.js"></script>
+</head>
+<body>    
+    <div b-mkd0nzmx6b class="container">
+        <main b-mkd0nzmx6b role="main" class="pb-4">
+            <article class="blog-post">
+
+                <div class="post-content">
+                    {POSTCONTENT}
+                </div>
+            </article>
+        </main>
+    </div>    
+</body>
+</html>
diff --git a/src/app/MZikmund.App/Views/Admin/PostEditorView.xaml.cs b/src/app/MZikmund.App/Views/Admin/PostEditorView.xaml.cs
@@ -14,7 +14,7 @@ public PostEditorView()
 	{
 		InitializeComponent();
 		// Read the template from the embedded resource
-		_postPreviewTemplate = typeof(PostEditorView).GetAssembly().GetManifestResourceStream("MZikmund.Assets.PostPreviewTemplate.html")?.ReadToEnd()!;
+		_postPreviewTemplate = typeof(PostEditorView).Assembly.GetManifestResourceStream("MZikmund.App.Assets.PostPreviewTemplate.html")!.ReadToEnd()!;
 		PreviewWebViewContainer.Content = _previewWebView = new WebView2();
 		this.Loaded += PostEditorView_Loaded;
 		this.Unloaded += PostEditorView_Unloaded;

diff --git a/src/app/MZikmund.App/Views/PostView.xaml.cs b/src/app/MZikmund.App/Views/PostView.xaml.cs
@@ -27,7 +27,7 @@ public PostView()
 	{
 		InitializeComponent();
 		// Read the template from the embedded resource
-		_postPreviewTemplate = typeof(PostView).GetAssembly().GetManifestResourceStream("MZikmund.Assets.PostPreviewTemplate.html")?.ReadToEnd()!;
+		_postPreviewTemplate = typeof(PostView).Assembly.GetManifestResourceStream("MZikmund.App.Assets.PostPreviewTemplate.html")?.ReadToEnd()!;
 		PreviewWebViewContainer.Content = _previewWebView = new WebView2();
 		this.Loaded += PostEditorView_Loaded;
 		this.Unloaded += PostEditorView_Unloaded;