Merge remote-tracking branch 'origin/main' into Unpackaged_WebAuth

# Conflicts: # docs/concepts/Splashscreen.md # src/Directory.Build.targets # src/WinUIEx/WinUIEx.csproj # src/WinUIExSample/App.xaml.cs # src/WinUIExSample/WinUIExSample.csproj
dotMorten · Nov 21, 2024 · f9a86e5 · f9a86e5
2 parents 5cf1f26 + 3a255aa
commit f9a86e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/concepts/Splashscreen.md b/docs/concepts/Splashscreen.md
@@ -10,7 +10,7 @@ WinUIEx provides two kinds of splash screens:
 `SimpleSplashScreen` will show an image while the app is loading. To use it, create a new `SimpleSplashScreen` in App.xaml.cs:
 
 ```cs
-private SimpleSplashScreen vss { get; set; }
+private SimpleSplashScreen fss { get; set; }
 
 public App()
 {
@@ -135,4 +135,4 @@ protected override async Task OnLoading()
     await Task.Delay(50);
   }
 }
-```
+```
diff --git a/src/WinUIExSample/App.xaml.cs b/src/WinUIExSample/App.xaml.cs
@@ -166,3 +166,4 @@ static void Main(string[] args)
     }
 #endif
         }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,3 +166,4 @@ static void Main(string[] args) @@
         }
     #endif
             }
+    }