diff --git a/Directory.Build.targets b/Directory.Build.targets
index 97943c5bec..cff16cd1e4 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -40,4 +40,9 @@
+
+
+
+
+
diff --git a/Packages.props b/Packages.props
index f0c272c944..6388482d8f 100644
--- a/Packages.props
+++ b/Packages.props
@@ -11,32 +11,30 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
diff --git a/e2e/Uno/HelloUnoWorld.Shared/App.xaml.cs b/e2e/Uno/HelloUnoWorld.Shared/App.xaml.cs
index 5bccf18ad8..1fb56bdfe6 100644
--- a/e2e/Uno/HelloUnoWorld.Shared/App.xaml.cs
+++ b/e2e/Uno/HelloUnoWorld.Shared/App.xaml.cs
@@ -143,14 +143,17 @@ protected override UIElement CreateShell()
#if NET5_0 && WINDOWS
_window = new Window();
- _window.Activate();
- _window.Content = shell;
-#endif
+#endif
#if HAS_UNO_WINUI || NETCOREAPP
- MainXamlRoot = shell.XamlRoot;
+ shell.Loaded += (s, e) => {
+ MainXamlRoot = shell.XamlRoot;
+ };
#endif
+ _window.Activate();
+ _window.Content = shell;
+
return shell;
}
diff --git a/e2e/Uno/HelloWorld.sln b/e2e/Uno/HelloWorld.sln
index 37d9b31695..c9b9002e08 100644
--- a/e2e/Uno/HelloWorld.sln
+++ b/e2e/Uno/HelloWorld.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29403.142
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.31903.286
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Uno", "..\..\src\Uno\Prism.Uno\Prism.Uno.csproj", "{B2A9C972-BD7A-4A95-B62C-F8385B819900}"
EndProject
@@ -1075,6 +1075,7 @@ Global
{19A48274-D9E3-4855-8900-C9C32198B509}.AppStore|x86.Deploy.0 = Debug|x86
{19A48274-D9E3-4855-8900-C9C32198B509}.Debug|Any CPU.ActiveCfg = Debug|x86
{19A48274-D9E3-4855-8900-C9C32198B509}.Debug|Any CPU.Build.0 = Debug|x86
+ {19A48274-D9E3-4855-8900-C9C32198B509}.Debug|Any CPU.Deploy.0 = Debug|x86
{19A48274-D9E3-4855-8900-C9C32198B509}.Debug|ARM.ActiveCfg = Debug|x86
{19A48274-D9E3-4855-8900-C9C32198B509}.Debug|arm64.ActiveCfg = Debug|arm64
{19A48274-D9E3-4855-8900-C9C32198B509}.Debug|arm64.Build.0 = Debug|arm64
@@ -1253,6 +1254,7 @@ Global
{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Debug|arm64.ActiveCfg = Debug|iPhoneSimulator
{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Debug|iPhone.ActiveCfg = Debug|iPhoneSimulator
+ {7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Debug|iPhone.Build.0 = Debug|iPhoneSimulator
{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{7DC51F24-0117-48FE-A07E-11773E6C4A0C}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
diff --git a/e2e/Uno/ModuleA/ModuleA.WinUI.csproj b/e2e/Uno/ModuleA/ModuleA.WinUI.csproj
index fc69c8ef59..2fb2729de8 100644
--- a/e2e/Uno/ModuleA/ModuleA.WinUI.csproj
+++ b/e2e/Uno/ModuleA/ModuleA.WinUI.csproj
@@ -7,6 +7,7 @@
true
$(DefineConstants);HAS_WINUI
ModuleA
+ true
$(DefineConstants);__WASM__
@@ -14,8 +15,13 @@
+
+
+
-
+
+ WinUI
+
%(Filename)
diff --git a/e2e/Uno/WinUI/HelloUnoWorld.Windows.Desktop/HelloUnoWorld.Windows.Desktop.csproj b/e2e/Uno/WinUI/HelloUnoWorld.Windows.Desktop/HelloUnoWorld.Windows.Desktop.csproj
index 730d9a63ba..083fa496f8 100644
--- a/e2e/Uno/WinUI/HelloUnoWorld.Windows.Desktop/HelloUnoWorld.Windows.Desktop.csproj
+++ b/e2e/Uno/WinUI/HelloUnoWorld.Windows.Desktop/HelloUnoWorld.Windows.Desktop.csproj
@@ -12,7 +12,7 @@
-
+
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/e2e/Uno/WinUI/HelloUnoWorld.Windows.Package/HelloUnoWorld.Windows.Package.wapproj b/e2e/Uno/WinUI/HelloUnoWorld.Windows.Package/HelloUnoWorld.Windows.Package.wapproj
index f4d149ac40..e467fbcd9a 100644
--- a/e2e/Uno/WinUI/HelloUnoWorld.Windows.Package/HelloUnoWorld.Windows.Package.wapproj
+++ b/e2e/Uno/WinUI/HelloUnoWorld.Windows.Package/HelloUnoWorld.Windows.Package.wapproj
@@ -1,92 +1,75 @@
-
+
- 15.0
+ 15.0
-
- Debug
- x86
-
-
- Release
- x86
-
-
- Debug
- x64
-
-
- Release
- x64
-
-
- Debug
- arm64
-
-
- Release
- arm64
-
+
+ Debug
+ x86
+
+
+ Release
+ x86
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+ Debug
+ arm64
+
+
+ Release
+ arm64
+
- $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\
- HelloUnoWorld.Windows.Desktop\
+ $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\
+ HelloUnoWorld.Windows.Desktop\
- 19a48274-d9e3-4855-8900-c9c32198b509
- 10.0.19041.0
- 10.0.17763.0
- en-US
- false
- $(MSBuildThisFileDirectory)build\
+ 19a48274-d9e3-4855-8900-c9c32198b509
+ 10.0.19041.0
+ 10.0.17763.0
+ net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)
+ en-US
+ false
+ ..\HelloUnoWorld.Windows.Desktop\HelloUnoWorld.Windows.Desktop.csproj
-
- Designer
-
+
+ Designer
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
- True
- Properties\PublishProfiles\win10-$(Platform).pubxml
-
+
+ True
+ Properties\PublishProfiles\win10-$(Platform).pubxml
+
-
-
- $(NUGET_PACKAGES)
- $(UserProfile)\.nuget\packages
- $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '0.5.0'))
- $(SolutionDir)packages\Microsoft.ProjectReunion.0.5.0-prerelease\
- $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '0.5.0'))
- $(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.0.5.0\
- $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props
- $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets
- ..\HelloUnoWorld.Windows.Desktop\HelloUnoWorld.Windows.Desktop.csproj
-
-
- all
-
-
- all
-
+
+ build
+
+
+ build
+
-
-
diff --git a/global.json b/global.json
index 1628c052e5..bac6ff0124 100644
--- a/global.json
+++ b/global.json
@@ -5,7 +5,7 @@
"allowPrerelease": false
},
"msbuild-sdks": {
- "MSBuild.Sdk.Extras": "3.0.23",
+ "MSBuild.Sdk.Extras": "3.0.38",
"Microsoft.Build.CentralPackageVersions": "2.0.79"
}
}
diff --git a/src/Uno/Prism.Uno/Extensions/DependencyObjectExtensions.Uno.cs b/src/Uno/Prism.Uno/Extensions/DependencyObjectExtensions.Uno.cs
index 52e217410b..9d593cd283 100644
--- a/src/Uno/Prism.Uno/Extensions/DependencyObjectExtensions.Uno.cs
+++ b/src/Uno/Prism.Uno/Extensions/DependencyObjectExtensions.Uno.cs
@@ -32,11 +32,7 @@ public static bool CheckAccess(this DependencyObject instance)
{
// Dispatcher queue HasThreadAccess is not yet implemented in Uno, we can fall back on CoreDispatcher
// See https://github.com/unoplatform/uno/issues/5818
-#if __ANDROID__ || __IOS__ || __MACOS__
- if(ApiInformation.IsPropertyPresent("Microsoft.System.DispatcherQueue", nameof(Microsoft.System.DispatcherQueue.HasThreadAccess)))
-#else
if(ApiInformation.IsPropertyPresent("Microsoft.UI.Dispatching.DispatcherQueue", nameof(Microsoft.UI.Dispatching.DispatcherQueue.HasThreadAccess)))
-#endif
{
return instance.DispatcherQueue.HasThreadAccess;
}