Skip to content

Commit

Permalink
Update nuggies~
Browse files Browse the repository at this point in the history 
Also added missing TableRow for MarkdownTextBlock
  • Loading branch information
@bagusnl
bagusnl committed Aug 23, 2024
1 parent ebe597f commit 2bb7696
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 65 deletions.
3 changes: 3 additions & 0 deletions CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2776,7 +2776,10 @@ private async Task StartSteamMigration(string gamePath)

try
{
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
// This is intentional as the dialog is only to cancel the routine, not waiting for user input.
SimpleDialogs.QueueAndSpawnDialog(contentDialog);
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
await gameRepairInstance.StartCheckRoutine();
statusActivity.Text = Lang._InstallMigrateSteam.Step4Title;
await gameRepairInstance.StartRepairRoutine(false);
Expand Down
18 changes: 9 additions & 9 deletions CollapseLauncher/CollapseLauncher.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@

<PackageReference Include="CommunityToolkit.Common" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.ImageCropper" Version="8.1.240328-rc" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240328-rc" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.1.240821" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.ImageCropper" Version="8.1.240821" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.1.240821" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240821" />
<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.1.240821" />
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.1.240821" />
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240821" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.1.240821" />

<!--
Only include FFmpegInteropX NuGet if USEFFMPEGFORVIDEOBG is defined in constants.
Expand All @@ -91,7 +91,7 @@

<PackageReference Include="GitInfo" Version="3.3.5" PrivateAssets="all" />
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.1.3" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.63" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.64" />
<PackageReference Include="ImageEx" Version="2.1.1" />
<PackageReference Include="Markdig.Signed" Version="0.37.0" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.2.0" />
Expand Down
14 changes: 14 additions & 0 deletions ...eme/CustomControls/CommunityToolkit.Labs/MarkdownTextBlock/Renderers/UWPObjectRenderer.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using CommunityToolkit.Labs.WinUI.Labs.MarkdownTextBlock.Renderers;
using Markdig.Renderers;
using Markdig.Syntax;

namespace CommunityToolkit.Labs.WinUI.MarkdownTextBlock.Renderers;

public abstract class UWPObjectRenderer<TObject> : MarkdownObjectRenderer<WinUIRenderer, TObject>
where TObject : MarkdownObject
{
}
44 changes: 44 additions & 0 deletions ...s/Theme/CustomControls/CommunityToolkit.Labs/MarkdownTextBlock/TextElements/MyTableRow.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using CommunityToolkit.Labs.WinUI.Labs.MarkdownTextBlock.TextElements;
using Markdig.Extensions.Tables;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Documents;

namespace CommunityToolkit.Labs.WinUI.MarkdownTextBlock.TextElements;

internal class MyTableRow : IAddChild
{
private TableRow _tableRow;

Check warning on line 14 in CollapseLauncher/XAMLs/Theme/CustomControls/CommunityToolkit.Labs/MarkdownTextBlock/TextElements/MyTableRow.cs

View workflow job for this annotation

GitHub Actions / Qodana for .NET

Non-accessed field (private accessibility) 

Field '_tableRow' is assigned but its value is never used
private StackPanel _stackPanel;
private Paragraph _paragraph;

public TextElement TextElement
{
get => _paragraph;
}

public MyTableRow(TableRow tableRow)
{
_tableRow = tableRow;
_paragraph = new Paragraph();

_stackPanel = new StackPanel();
_stackPanel.Orientation = Orientation.Horizontal;
var inlineUIContainer = new InlineUIContainer();
inlineUIContainer.Child = _stackPanel;
_paragraph.Inlines.Add(inlineUIContainer);
}

public void AddChild(IAddChild child)
{
if (child is MyTableCell cellChild)
{
var richTextBlock = new RichTextBlock();
richTextBlock.Blocks.Add((Paragraph)cellChild.TextElement);
_stackPanel.Children.Add(richTextBlock);
}
}
}
107 changes: 54 additions & 53 deletions CollapseLauncher/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,78 +22,78 @@
},
"CommunityToolkit.WinUI.Behaviors": {
"type": "Direct",
"requested": "[8.0.240109, )",
"resolved": "8.0.240109",
"contentHash": "Rs7rAWkIcLhs6s8d/Qh0r6IxkCLjC0CUaT2U+LgpHnFWl4A/1p3A1S+zfUIdow+wguwLGh8w1p19eWBO5hxCXw==",
"requested": "[8.1.240821, )",
"resolved": "8.1.240821",
"contentHash": "nc6MZdYp7ee1f8Qu8JO1LtbOuzAMtm79QN9073YMLTLZliCWVijfW+OFIVRHsFcCxpv6Ep4ii63x/OjXZIuWAQ==",
"dependencies": {
"CommunityToolkit.WinUI.Animations": "8.0.240109",
"CommunityToolkit.WinUI.Extensions": "8.0.240109",
"CommunityToolkit.WinUI.Animations": "8.1.240821",
"CommunityToolkit.WinUI.Extensions": "8.1.240821",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
"Microsoft.WindowsAppSDK": "1.3.230331000",
"Microsoft.WindowsAppSDK": "1.5.240311000",
"Microsoft.Xaml.Behaviors.WinUI.Managed": "2.0.9"
}
},
"CommunityToolkit.WinUI.Controls.ImageCropper": {
"type": "Direct",
"requested": "[8.1.240328-rc, )",
"resolved": "8.1.240328-rc",
"contentHash": "W23a9N7L9GY0F7Cq8Egs7qansEo/14C6C9EPCgh9sleRwgk+y+QHdhNFFnZsLw2qdSoJW5FmEqehTDjKm6zr9g==",
"requested": "[8.1.240821, )",
"resolved": "8.1.240821",
"contentHash": "nafCnTNqXbI47xJRGsQpli0dBUvQ93O6c9AEUfuBdxCYcA6uwdNUiBW9Gq7piXyQo6yjM8G5pRyprxyVi+nwaQ==",
"dependencies": {
"CommunityToolkit.WinUI.Extensions": "8.1.240328-rc",
"CommunityToolkit.WinUI.Extensions": "8.1.240821",
"Microsoft.Graphics.Win2D": "1.0.0.30",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
"Microsoft.WindowsAppSDK": "1.5.240311000"
}
},
"CommunityToolkit.WinUI.Controls.Primitives": {
"type": "Direct",
"requested": "[8.0.240109, )",
"resolved": "8.0.240109",
"contentHash": "MSOP92ygiFbaUNciCfQWTWw8eRwJrZ6G+4TNXwy6G6e/9KPLt5QsFtaqvjRaVx01BF/YwLtOGp4fNqCBdmKlRA==",
"requested": "[8.1.240821, )",
"resolved": "8.1.240821",
"contentHash": "upwSObO113gfSMjMGTYGZs2zjK8smtkzaH1bSKYAau4vk4gVu3Ildnk8dMFfp5lkZKs+6xON2jbj/gfUFC2Xiw==",
"dependencies": {
"CommunityToolkit.WinUI.Extensions": "8.0.240109",
"CommunityToolkit.WinUI.Extensions": "8.1.240821",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
"Microsoft.WindowsAppSDK": "1.3.230331000"
"Microsoft.WindowsAppSDK": "1.5.240311000"
}
},
"CommunityToolkit.WinUI.Controls.SettingsControls": {
"type": "Direct",
"requested": "[8.0.240109, )",
"resolved": "8.0.240109",
"contentHash": "mUkgbZHSAF7AsY//LvWQvh4eRWqONEObM+piA8SUZvsyqNYLsDl1XhdhEzyRZ6F6Y3NdSDDSNQMsve7fjCzVJA==",
"requested": "[8.1.240821, )",
"resolved": "8.1.240821",
"contentHash": "a5eEsR1wQSuVUsQALEpZiq6dNrTuw0POQCD6NXMBID+mY0g672Pg8OPG4MyTbwOgj+1NPua51WM22WFVGteRlQ==",
"dependencies": {
"CommunityToolkit.WinUI.Triggers": "8.0.240109",
"CommunityToolkit.WinUI.Triggers": "8.1.240821",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
"Microsoft.WindowsAppSDK": "1.3.230331000"
"Microsoft.WindowsAppSDK": "1.5.240311000"
}
},
"CommunityToolkit.WinUI.Controls.Sizers": {
"type": "Direct",
"requested": "[8.0.240109, )",
"resolved": "8.0.240109",
"contentHash": "84gj+v4FvY3O8Owm212zlX7prylxR8alHhe6LYzRHJj3D4nCARKBbBubkKcuX+80VqdbfIv8Kq/pq8g3NtSlzQ==",
"requested": "[8.1.240821, )",
"resolved": "8.1.240821",
"contentHash": "qnJNGocX/XoaT1yADeG75Hb4JOIh5VcmO3j6EeE1iY6gq1+Z4LVBREVC6Dz7/notBPlEErysMgbJVKURimRKsw==",
"dependencies": {
"CommunityToolkit.WinUI.Extensions": "8.0.240109",
"CommunityToolkit.WinUI.Extensions": "8.1.240821",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
"Microsoft.WindowsAppSDK": "1.3.230331000"
"Microsoft.WindowsAppSDK": "1.5.240311000"
}
},
"CommunityToolkit.WinUI.Converters": {
"type": "Direct",
"requested": "[8.0.240109, )",
"resolved": "8.0.240109",
"contentHash": "WYY2zP9WiByHzyW0OVLQFU4tFnCFpWsa7uz/NRIOgYD5RQn5cK6KbRlaN+D6G2fgFdqAJP453fKemojPcBsvoQ==",
"requested": "[8.1.240821, )",
"resolved": "8.1.240821",
"contentHash": "Fz8uewTFTrtj3qsPrgRQ2Ld7efjdGb7EVYLxGoNuii9pS4SiKqGC2KEUJqZ8oQlXX4eUFiO5pqOeE5SC/fQoPw==",
"dependencies": {
"CommunityToolkit.Common": "8.2.1",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
"Microsoft.WindowsAppSDK": "1.3.230331000"
"Microsoft.WindowsAppSDK": "1.5.240311000"
}
},
"CommunityToolkit.WinUI.Extensions": {
"type": "Direct",
"requested": "[8.1.240328-rc, )",
"resolved": "8.1.240328-rc",
"contentHash": "n/UMjCRktQ/e2QbiJGB6iTrZUkUu90YjY8D0UiRfiy/8BL+zP8L+sZ3eX32TLDeY4CxnAO6nXfal+a0BNL8jyA==",
"requested": "[8.1.240821, )",
"resolved": "8.1.240821",
"contentHash": "mYVvEWQYF6keFQ0X2yEcTFNCarhw9fTSqMDFM00/fxWmGG2RvyyC0t8k/BeqAuV9azM9ZkRNTCqRt36usUsdFg==",
"dependencies": {
"CommunityToolkit.Common": "8.2.1",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
Expand All @@ -102,14 +102,15 @@
},
"CommunityToolkit.WinUI.Media": {
"type": "Direct",
"requested": "[8.0.240109, )",
"resolved": "8.0.240109",
"contentHash": "86uMPNIPwZNq98oXET9HJzCT07SuKLPsQGeDjBRQSPdou6LCo4hpw5yWDmy1cEUBe3oIgVYZjgKZw5G7Y+n6RQ==",
"requested": "[8.1.240821, )",
"resolved": "8.1.240821",
"contentHash": "BriTsGK69Kw71OLCbVCTZXe5hEKk1xfahZccl7PTuQYg6wo7k5mQDEOKnVtJqynW2Yd/IQznU9qEJ+t7jizWOA==",
"dependencies": {
"CommunityToolkit.WinUI.Animations": "8.0.240109",
"Microsoft.Graphics.Win2D": "1.0.5.1",
"CommunityToolkit.WinUI.Animations": "8.1.240821",
"CommunityToolkit.WinUI.Extensions": "8.1.240821",
"Microsoft.Graphics.Win2D": "1.1.1",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
"Microsoft.WindowsAppSDK": "1.3.230331000"
"Microsoft.WindowsAppSDK": "1.5.240311000"
}
},
"GitInfo": {
Expand All @@ -133,9 +134,9 @@
},
"HtmlAgilityPack": {
"type": "Direct",
"requested": "[1.11.63, )",
"resolved": "1.11.63",
"contentHash": "cAWxtzqcCcv3ZpnpPXa6Rj309hqkMP9UajmhWZ3nje0murYIzR0cpdNGqz/aNK8BNwlof1R04bqom9VsNglZyg=="
"requested": "[1.11.64, )",
"resolved": "1.11.64",
"contentHash": "5GtlZ7Y/L1k5zBokuOGW96PVTItRv/QCUJWlXiZ5YvYN2DI8wFto+WXBxkF55DdG0WabAG/F3ghqOMGdo89Rlg=="
},
"ImageEx": {
"type": "Direct",
Expand Down Expand Up @@ -341,32 +342,32 @@
},
"CommunityToolkit.WinUI.Animations": {
"type": "Transitive",
"resolved": "8.0.240109",
"contentHash": "63zWEFpGc4lr/lT5f8F0tr4leUqCc8tZe7J4uhJ0ZoP1GdwGZnKNBqtQApbXoxvGCLSU/5zuM3/cZIBId5dDdA==",
"resolved": "8.1.240821",
"contentHash": "ehqSIkYUE8bauxUTp/q3aI6VrX7os/8Bc+8+FFnpErI0u/aeBI6CYZe+WgiLGefxy8/hNHPrtJBbczah7o0y6g==",
"dependencies": {
"CommunityToolkit.WinUI.Extensions": "8.0.240109",
"CommunityToolkit.WinUI.Extensions": "8.1.240821",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
"Microsoft.WindowsAppSDK": "1.3.230331000"
"Microsoft.WindowsAppSDK": "1.5.240311000"
}
},
"CommunityToolkit.WinUI.Helpers": {
"type": "Transitive",
"resolved": "8.0.240109",
"contentHash": "KzIyOq455H8YtjZVNKXyQ6tS/KwFTiud+Usi9+Y3tJSqsGAu00ToNaDSVcJmec116BZ7dGA12+pdEynOQo9yEA==",
"resolved": "8.1.240821",
"contentHash": "/h4p1+5Hv9j61mp++IfiWxVihq0yb6maRcIRrehzB4YTXFU60P3pZwQShNytTVnGMDRm6AgupbtnBoG+38PBnA==",
"dependencies": {
"CommunityToolkit.WinUI.Extensions": "8.0.240109",
"CommunityToolkit.WinUI.Extensions": "8.1.240821",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
"Microsoft.WindowsAppSDK": "1.3.230331000"
"Microsoft.WindowsAppSDK": "1.5.240311000"
}
},
"CommunityToolkit.WinUI.Triggers": {
"type": "Transitive",
"resolved": "8.0.240109",
"contentHash": "fJJ9IpxjyZUyEGjWLBGl7qq1fG70PGh6EPbZyyXtEiqdefkdN315mV5omMVDePZtImLqeQO5HWJnobRxedvxAw==",
"resolved": "8.1.240821",
"contentHash": "D5Xr3MsJX1n3iIi7SnAW29Nec6K1rQDSfuFNZGHrdIsqnVw5Tu8ITmWjv3oWQAdEWql7vcyY/Hezb7l4uFXP0w==",
"dependencies": {
"CommunityToolkit.WinUI.Helpers": "8.0.240109",
"CommunityToolkit.WinUI.Helpers": "8.1.240821",
"Microsoft.Windows.SDK.BuildTools": "10.0.22621.756",
"Microsoft.WindowsAppSDK": "1.3.230331000"
"Microsoft.WindowsAppSDK": "1.5.240311000"
}
},
"Google.Protobuf": {
Expand Down
6 changes: 3 additions & 3 deletions Hi3Helper.EncTool.Test/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"net8.0": {
"Google.Protobuf": {
"type": "Transitive",
"resolved": "3.27.2",
"contentHash": "0wdgA3LO9mBS477jieBFs4pU1sWhVtwv/P+i9nAEiFDQyUA7PPHDBbJL1CeqYtV18jLiq9og4n7wSVCO171OBg=="
"resolved": "3.27.3",
"contentHash": "ld+oe1+Mc6no643d8otGm6Zylu7KBpGnAiqOW3nOpV8VxUuqhz70vRNKUU5grLaCeuUQVF8t9dm8TgmkTMr1Tg=="
},
"System.IO.Hashing": {
"type": "Transitive",
Expand All @@ -15,7 +15,7 @@
"hi3helper.enctool": {
"type": "Project",
"dependencies": {
"Google.Protobuf": "[3.27.2, )",
"Google.Protobuf": "[3.27.3, )",
"Hi3Helper.Http": "[1.5.0, )",
"System.IO.Hashing": "[8.0.0, )"
}
Expand Down

0 comments on commit 2bb7696

Please sign in to comment.