diff --git a/samples/Playground/Directory.Build.targets b/samples/Playground/Directory.Build.targets
index 93b28e4f37..6078d8bdfe 100644
--- a/samples/Playground/Directory.Build.targets
+++ b/samples/Playground/Directory.Build.targets
@@ -34,4 +34,9 @@
+
+
+
diff --git a/samples/Playground/Directory.Packages.props b/samples/Playground/Directory.Packages.props
index 557da1780e..90a83318b7 100644
--- a/samples/Playground/Directory.Packages.props
+++ b/samples/Playground/Directory.Packages.props
@@ -25,20 +25,20 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 628c8cc76e..8e9f731150 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -43,15 +43,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/Uno.Extensions.Authentication.MSAL/Directory.Build.targets b/src/Uno.Extensions.Authentication.MSAL/Directory.Build.targets
new file mode 100644
index 0000000000..5a348b8950
--- /dev/null
+++ b/src/Uno.Extensions.Authentication.MSAL/Directory.Build.targets
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.csproj b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.csproj
index a8d3a26d0d..a1643bf26e 100644
--- a/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.csproj
+++ b/src/Uno.Extensions.Authentication.Msal/Uno.Extensions.Authentication.Msal.WinUI.csproj
@@ -4,7 +4,6 @@
MSAL Authentication Extensions for the Uno Platform (WinUI)
false
-
@@ -48,9 +47,12 @@
14.2
15.4
-
-
+
+
+
+
+
@@ -61,4 +63,5 @@
+
diff --git a/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.WinUI.csproj b/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.WinUI.csproj
index df77e454dd..604ac1c2c3 100644
--- a/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.WinUI.csproj
+++ b/src/Uno.Extensions.Authentication.Oidc/Uno.Extensions.Authentication.Oidc.WinUI.csproj
@@ -14,9 +14,12 @@
Uno.Extensions.Authentication.Oidc.WinUI
$(DefineConstants);WINUI
+
+
+
+
-
diff --git a/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.WinUI.csproj b/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.WinUI.csproj
index baaca7722b..0d3db68e8b 100644
--- a/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.WinUI.csproj
+++ b/src/Uno.Extensions.Authentication.UI/Uno.Extensions.Authentication.WinUI.csproj
@@ -13,8 +13,11 @@
$(DefineConstants);WINUI
-
+
+
+
+
diff --git a/src/Uno.Extensions.Hosting.UI/AppHostingEnvironment.cs b/src/Uno.Extensions.Hosting.UI/AppHostingEnvironment.cs
index 120493da9e..442b64463b 100644
--- a/src/Uno.Extensions.Hosting.UI/AppHostingEnvironment.cs
+++ b/src/Uno.Extensions.Hosting.UI/AppHostingEnvironment.cs
@@ -1,4 +1,6 @@
-using Uno.Foundation;
+#if __WASM__
+using Uno.Foundation;
+#endif
namespace Uno.Extensions.Hosting;
diff --git a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Skia.csproj b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Skia.csproj
index 3b9d9dcbdb..1f8c21aa65 100644
--- a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Skia.csproj
+++ b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.Skia.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj
index 4f2dddf3de..93edaa3bb9 100644
--- a/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj
+++ b/src/Uno.Extensions.Hosting.UI/Uno.Extensions.Hosting.WinUI.csproj
@@ -17,7 +17,7 @@
$(DefineConstants);WINUI
-
+
diff --git a/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.WinUI.csproj b/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.WinUI.csproj
index 7dc10c20c7..2cc6d3f37e 100644
--- a/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.WinUI.csproj
+++ b/src/Uno.Extensions.Localization.UI/Uno.Extensions.Localization.WinUI.csproj
@@ -10,8 +10,8 @@
$(DefineConstants);WINUI
-
-
+
+
diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Skia.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Skia.csproj
index c0d43c4d27..80a828373d 100644
--- a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Skia.csproj
+++ b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.Skia.csproj
@@ -9,7 +9,7 @@
Uno.Extensions.Logging.WinUI
-
+
diff --git a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj
index dbce20f055..6da005e75f 100644
--- a/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj
+++ b/src/Uno.Extensions.Logging/Uno.Extensions.Logging.WinUI.csproj
@@ -21,7 +21,7 @@
-
+
diff --git a/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.WinUI.csproj b/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.WinUI.csproj
index a2a12a9940..ce1f93a842 100644
--- a/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.WinUI.csproj
+++ b/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.WinUI.csproj
@@ -17,8 +17,10 @@
-
+
+
+
diff --git a/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.WinUI.csproj b/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.WinUI.csproj
index 99117301f2..dfe73b46ae 100644
--- a/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.WinUI.csproj
+++ b/src/Uno.Extensions.Navigation.UI/Uno.Extensions.Navigation.WinUI.csproj
@@ -13,7 +13,7 @@
$(DefineConstants);WINUI
-
+
diff --git a/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.WinUI.csproj b/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.WinUI.csproj
index abaa00ff2f..dec96346c8 100644
--- a/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.WinUI.csproj
+++ b/src/Uno.Extensions.Reactive.UI/Uno.Extensions.Reactive.UI.WinUI.csproj
@@ -14,8 +14,11 @@
-
+
+
+
+
diff --git a/src/Uno.Extensions.Storage.UI/GlobalUsings.cs b/src/Uno.Extensions.Storage.UI/GlobalUsings.cs
index 1892f61849..b6fb7a65b1 100644
--- a/src/Uno.Extensions.Storage.UI/GlobalUsings.cs
+++ b/src/Uno.Extensions.Storage.UI/GlobalUsings.cs
@@ -14,6 +14,7 @@
global using Uno.Extensions.Storage;
global using Uno.Extensions.Storage.KeyValueStorage;
global using Uno.Extensions.Threading;
+global using Windows.Security.Credentials;
global using Windows.Storage;
#if WINUI
@@ -27,7 +28,7 @@
global using Microsoft.UI.Xaml.Data;
global using Microsoft.UI.Xaml.Media;
#else
- global using Windows.System;
+global using Windows.System;
global using Windows.UI.Xaml;
global using Windows.UI.Xaml.Controls;
global using Windows.UI.Xaml.Controls.Primitives;
diff --git a/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.WinUI.csproj b/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.WinUI.csproj
index deee23f6e1..8d06c6bc72 100644
--- a/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.WinUI.csproj
+++ b/src/Uno.Extensions.Storage.UI/Uno.Extensions.Storage.WinUI.csproj
@@ -13,7 +13,7 @@
$(DefineConstants);WINUI
-
+
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props b/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props
index d5de932339..a910a1c77d 100644
--- a/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props
+++ b/src/Uno.Extensions.Templates/content/unoapp-extensions/Directory.Packages.props
@@ -10,18 +10,18 @@
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/testing/TestHarness/Directory.Packages.props b/testing/TestHarness/Directory.Packages.props
index 344518ac5b..89ccfd48eb 100644
--- a/testing/TestHarness/Directory.Packages.props
+++ b/testing/TestHarness/Directory.Packages.props
@@ -35,19 +35,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,13 +55,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+