diff --git a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets index d7306c3e28b7..397f7ed4070a 100644 --- a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets +++ b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets @@ -107,6 +107,7 @@ + diff --git a/eng/Microsoft.Extensions.targets b/eng/Microsoft.Extensions.targets index 88bf34173637..c4edc163ada2 100644 --- a/eng/Microsoft.Extensions.targets +++ b/eng/Microsoft.Extensions.targets @@ -15,8 +15,8 @@ <_MicrosoftSystemCodeDomVersion>4.7.0 - <_MicrosoftProjectReunionVersion>0.8.0-preview - <_MicrosoftGraphicsWin2DVersion>0.5.0.13 + <_MicrosoftProjectReunionVersion>0.8.0 + <_MicrosoftGraphicsWin2DVersion>0.8.0.21 <_MicrosoftMauiGraphics>6.0.100-preview.5.246 <_MicrosoftMauiGraphicsWin2D>6.0.100-preview.5.229 <_MicrosoftAspNetCoreVersion>6.0.0-preview.5.21301.17 @@ -100,6 +100,11 @@ Update="Microsoft.ProjectReunion.WinUI" Version="$(_MicrosoftProjectReunionVersion)" /> + build + + build + diff --git a/src/Compatibility/Core/src/WinUI/Forms.cs b/src/Compatibility/Core/src/WinUI/Forms.cs index ae7061d3444a..343510412dfc 100644 --- a/src/Compatibility/Core/src/WinUI/Forms.cs +++ b/src/Compatibility/Core/src/WinUI/Forms.cs @@ -108,7 +108,7 @@ static void SetupInit( Registrar.ExtraAssemblies = rendererAssemblies?.ToArray(); - var dispatcher = mainWindow?.DispatcherQueue ?? System.DispatcherQueue.GetForCurrentThread(); + var dispatcher = mainWindow?.DispatcherQueue ?? UI.Dispatching.DispatcherQueue.GetForCurrentThread(); var platformServices = new WindowsPlatformServices(dispatcher); diff --git a/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs b/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs index 6818c2dacc2a..0dcce5942931 100644 --- a/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs +++ b/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs @@ -30,12 +30,12 @@ internal abstract class WindowsBasePlatformServices : IPlatformServices, IPlatfo { const string WrongThreadError = "RPC_E_WRONG_THREAD"; #pragma warning disable CS8305 // Type is for evaluation purposes only and is subject to change or removal in future updates. - readonly Microsoft.System.DispatcherQueue _dispatcher; + readonly Microsoft.UI.Dispatching.DispatcherQueue _dispatcher; #pragma warning restore CS8305 // Type is for evaluation purposes only and is subject to change or removal in future updates. readonly UISettings _uiSettings = new UISettings(); #pragma warning disable CS8305 // Type is for evaluation purposes only and is subject to change or removal in future updates. - protected WindowsBasePlatformServices(Microsoft.System.DispatcherQueue dispatcher) + protected WindowsBasePlatformServices(Microsoft.UI.Dispatching.DispatcherQueue dispatcher) #pragma warning restore CS8305 // Type is for evaluation purposes only and is subject to change or removal in future updates. { _dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher)); diff --git a/src/Compatibility/Core/src/WinUI/WindowsPlatformServices.cs b/src/Compatibility/Core/src/WinUI/WindowsPlatformServices.cs index 9d569fcafc8d..8457e84c1ed3 100644 --- a/src/Compatibility/Core/src/WinUI/WindowsPlatformServices.cs +++ b/src/Compatibility/Core/src/WinUI/WindowsPlatformServices.cs @@ -5,7 +5,7 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP internal class WindowsPlatformServices : WindowsBasePlatformServices { #pragma warning disable CS8305 // Type is for evaluation purposes only and is subject to change or removal in future updates. - public WindowsPlatformServices(Microsoft.System.DispatcherQueue dispatcher) : base(dispatcher) + public WindowsPlatformServices(Microsoft.UI.Dispatching.DispatcherQueue dispatcher) : base(dispatcher) #pragma warning restore CS8305 // Type is for evaluation purposes only and is subject to change or removal in future updates. { } diff --git a/src/Controls/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj b/src/Controls/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj index c3b6aeadf48f..6101c954338c 100644 --- a/src/Controls/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj +++ b/src/Controls/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj @@ -65,6 +65,9 @@ build + + build + diff --git a/src/Essentials/src/MainThread/MainThread.uwp.cs b/src/Essentials/src/MainThread/MainThread.uwp.cs index 14263842ac4c..97decb9c9f01 100644 --- a/src/Essentials/src/MainThread/MainThread.uwp.cs +++ b/src/Essentials/src/MainThread/MainThread.uwp.cs @@ -5,7 +5,7 @@ using Windows.ApplicationModel.Core; using Windows.UI.Core; #elif WINDOWS -using Microsoft.System; +using Microsoft.UI.Dispatching; #endif namespace Microsoft.Maui.Essentials diff --git a/src/Templates/src/templates/maui-blazor/.template.config/template.json b/src/Templates/src/templates/maui-blazor/.template.config/template.json index d0b85835aed2..9a221e8c745f 100644 --- a/src/Templates/src/templates/maui-blazor/.template.config/template.json +++ b/src/Templates/src/templates/maui-blazor/.template.config/template.json @@ -46,7 +46,7 @@ "type": "parameter", "dataType": "string", "replaces": "PROJECT_REUNION_VERSION", - "defaultValue": "0.8.0-preview" + "defaultValue": "0.8.0" } }, "defaultName": "MauiApp1" diff --git a/src/Templates/src/templates/maui-blazor/MauiApp1.WinUI/MauiApp1.WinUI.csproj b/src/Templates/src/templates/maui-blazor/MauiApp1.WinUI/MauiApp1.WinUI.csproj index e1835e3c1d96..d29af08a3f53 100644 --- a/src/Templates/src/templates/maui-blazor/MauiApp1.WinUI/MauiApp1.WinUI.csproj +++ b/src/Templates/src/templates/maui-blazor/MauiApp1.WinUI/MauiApp1.WinUI.csproj @@ -65,6 +65,7 @@ + diff --git a/src/Templates/src/templates/maui-mobile/.template.config/template.json b/src/Templates/src/templates/maui-mobile/.template.config/template.json index 431ac4b73e44..d6afde20a331 100644 --- a/src/Templates/src/templates/maui-mobile/.template.config/template.json +++ b/src/Templates/src/templates/maui-mobile/.template.config/template.json @@ -36,7 +36,7 @@ "type": "parameter", "dataType": "string", "replaces": "PROJECT_REUNION_VERSION", - "defaultValue": "0.8.0-preview" + "defaultValue": "0.8.0" } }, "defaultName": "MauiApp1" diff --git a/src/Templates/src/templates/maui-mobile/MauiApp1.WinUI/MauiApp1.WinUI.csproj b/src/Templates/src/templates/maui-mobile/MauiApp1.WinUI/MauiApp1.WinUI.csproj index da5dfa8c945a..d1e080339e3e 100644 --- a/src/Templates/src/templates/maui-mobile/MauiApp1.WinUI/MauiApp1.WinUI.csproj +++ b/src/Templates/src/templates/maui-mobile/MauiApp1.WinUI/MauiApp1.WinUI.csproj @@ -55,6 +55,7 @@ + diff --git a/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj b/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj index dba0694baa79..c8017d1aa66c 100644 --- a/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj +++ b/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj @@ -31,6 +31,7 @@ +