Skip to content

Update WinUI to 0.8 stable #1522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PureWeen merged 1 commit into from
Jul 1, 2021
Merged

Update WinUI to 0.8 stable #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nuspec/Microsoft.Maui.Controls.MultiTargeting.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
<PackageReference Include="Microsoft.ProjectReunion" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" />
<PackageReference Include="Microsoft.ProjectReunion.InteractiveExperiences" NoWarn="NU1701" />
<PackageReference Include="Microsoft.Graphics.Win2D" />
<PackageReference Include="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop" />
</ItemGroup>
Expand Down
9 changes: 7 additions & 2 deletions eng/Microsoft.Extensions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<_MicrosoftSystemCodeDomVersion>4.7.0</_MicrosoftSystemCodeDomVersion>
</PropertyGroup>
<PropertyGroup>
<_MicrosoftProjectReunionVersion>0.8.0-preview</_MicrosoftProjectReunionVersion>
<_MicrosoftGraphicsWin2DVersion>0.5.0.13</_MicrosoftGraphicsWin2DVersion>
<_MicrosoftProjectReunionVersion>0.8.0</_MicrosoftProjectReunionVersion>
<_MicrosoftGraphicsWin2DVersion>0.8.0.21</_MicrosoftGraphicsWin2DVersion>
<_MicrosoftMauiGraphics>6.0.100-preview.5.246</_MicrosoftMauiGraphics>
<_MicrosoftMauiGraphicsWin2D>6.0.100-preview.5.229</_MicrosoftMauiGraphicsWin2D>
<_MicrosoftAspNetCoreVersion>6.0.0-preview.5.21301.17</_MicrosoftAspNetCoreVersion>
Expand Down Expand Up @@ -100,6 +100,11 @@
Update="Microsoft.ProjectReunion.WinUI"
Version="$(_MicrosoftProjectReunionVersion)"
/>
<PackageReference
Update="Microsoft.ProjectReunion.InteractiveExperiences"
Version="$(_MicrosoftProjectReunionVersion)"
NoWarn="NU1701"
/>
Comment on lines +103 to +107
Copy link
Member Author

@mattleibow mattleibow Jul 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be a restore error because it can't figure out that net6-windows is like net5-windows, but just a bit more.

Copy link
Contributor

@dotMorten dotMorten Jul 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrewleader Is this a known bug?

Copy link

@andrewleader andrewleader Jul 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll double check with the team, thanks Morten!

<PackageReference
Update="Microsoft.Graphics.Win2D"
Version="$(_MicrosoftGraphicsWin2DVersion)"
Expand Down
3 changes: 3 additions & 0 deletions ...y/ControlGallery/src/WinUI (Package)/Compatibility.ControlGallery.WinUI (Package).wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[$(_MicrosoftProjectReunionVersion)]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.ProjectReunion.InteractiveExperiences" Version="[$(_MicrosoftProjectReunionVersion)]" NoWarn="NU1701">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WinUI\Compatibility.ControlGallery.WinUI.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/Core/src/WinUI/Forms.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/Core/src/WinUI/WindowsPlatformServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
{
}
Expand Down
3 changes: 3 additions & 0 deletions ...rols/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[$(_MicrosoftProjectReunionVersion)]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.ProjectReunion.InteractiveExperiences" Version="[$(_MicrosoftProjectReunionVersion)]" NoWarn="NU1701">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Controls.Sample.WinUI\Maui.Controls.Sample.WinUI.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Essentials/src/MainThread/MainThread.uwp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Templates/src/templates/maui-blazor/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"type": "parameter",
"dataType": "string",
"replaces": "PROJECT_REUNION_VERSION",
"defaultValue": "0.8.0-preview"
"defaultValue": "0.8.0"
}
},
"defaultName": "MauiApp1"
Expand Down
1 change: 1 addition & 0 deletions src/Templates/src/templates/maui-blazor/MauiApp1.WinUI/MauiApp1.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<PackageReference Include="Microsoft.ProjectReunion" Version="PROJECT_REUNION_VERSION" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="PROJECT_REUNION_VERSION" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="PROJECT_REUNION_VERSION" />
<PackageReference Include="Microsoft.ProjectReunion.InteractiveExperiences" Version="PROJECT_REUNION_VERSION" NoWarn="NU1701" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Templates/src/templates/maui-mobile/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"type": "parameter",
"dataType": "string",
"replaces": "PROJECT_REUNION_VERSION",
"defaultValue": "0.8.0-preview"
"defaultValue": "0.8.0"
}
},
"defaultName": "MauiApp1"
Expand Down
1 change: 1 addition & 0 deletions src/Templates/src/templates/maui-mobile/MauiApp1.WinUI/MauiApp1.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<PackageReference Include="Microsoft.ProjectReunion" Version="PROJECT_REUNION_VERSION" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="PROJECT_REUNION_VERSION" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="PROJECT_REUNION_VERSION" />
<PackageReference Include="Microsoft.ProjectReunion.InteractiveExperiences" Version="PROJECT_REUNION_VERSION" NoWarn="NU1701" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<PackageReference Include="Microsoft.ProjectReunion" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" />
<PackageReference Include="Microsoft.ProjectReunion.InteractiveExperiences" NoWarn="NU1701" />
<PackageReference Include="Microsoft.Graphics.Win2D" />
</ItemGroup>

Expand Down