Update Avalonia to 11.0.1

Onebeld · Jul 26, 2023 · 39fb766 · 39fb766
1 parent 1e1de10
commit 39fb766
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/RegulSaveCleaner/Core/RegulSettings.cs b/RegulSaveCleaner/Core/RegulSettings.cs
@@ -3,6 +3,7 @@
 using Avalonia.Collections;
 using Avalonia.Media;
 using PleasantUI;
+using PleasantUI.Core;
 using PleasantUI.Core.Constants;
 using RegulSaveCleaner.Core.Constants;
 using RegulSaveCleaner.Structures;

diff --git a/RegulSaveCleaner/RegulSaveCleaner.csproj b/RegulSaveCleaner/RegulSaveCleaner.csproj
@@ -16,10 +16,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
+        <PackageReference Include="Avalonia" Version="11.0.1" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.1" />
         <PackageReference Include="Pfim" Version="0.11.2" />
-        <PackageReference Include="PleasantUI" Version="3.0.8" />
+        <PackageReference Include="PleasantUI" Version="3.0.9" />
         <PackageReference Condition="'$(TargetFramework)' != 'net461'" Include="SixLabors.ImageSharp" Version="3.0.1" />
         <PackageReference Condition="'$(TargetFramework)' == 'net461'" Include="SixLabors.ImageSharp" Version="2.1.4" />
     </ItemGroup>
@@ -40,10 +40,9 @@
 
     <PropertyGroup Condition="'$(Configuration.toUpper())' != 'DEBUG'">
         <TrimMode>link</TrimMode>
-        <TrimmerDefaultAction>link</TrimmerDefaultAction>
-        <IlcGenerateCompleteTypeMetadata>false</IlcGenerateCompleteTypeMetadata>
         <IlcGenerateStackTraceData>false</IlcGenerateStackTraceData>
         <IlcDisableUnhandledExceptionExperience>true</IlcDisableUnhandledExceptionExperience>
+        <IlcFoldIdenticalMethodBodies>true</IlcFoldIdenticalMethodBodies>
         <StripSymbols>true</StripSymbols>
         <OptimizationPreference>Size</OptimizationPreference>
         <MetadataUpdaterSupport>false</MetadataUpdaterSupport>

diff --git a/RegulSaveCleaner/Resources/ClearCacheInlines.axaml b/RegulSaveCleaner/Resources/ClearCacheInlines.axaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
     <!--All-->
     <InlineCollection x:Key="WorldCacheInline">
         <Run Text="{StaticResource All}" />

diff --git a/RegulSaveCleaner/Resources/DataTemplates/SaveFilesDataTemplates.axaml b/RegulSaveCleaner/Resources/DataTemplates/SaveFilesDataTemplates.axaml
@@ -2,7 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:structures="clr-namespace:RegulSaveCleaner.Structures"
                     xmlns:core="clr-namespace:RegulSaveCleaner.Core"
-                    xmlns:converters="clr-namespace:RegulSaveCleaner.Core.Converters">
+                    xmlns:converters="clr-namespace:RegulSaveCleaner.Core.Converters"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <MergeResourceInclude Source="../MenuFlyouts.axaml" />
     </ResourceDictionary.MergedDictionaries>

diff --git a/RegulSaveCleaner/Resources/MenuFlyouts.axaml b/RegulSaveCleaner/Resources/MenuFlyouts.axaml
@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:views="clr-namespace:RegulSaveCleaner.Views"
-                    xmlns:structures="clr-namespace:RegulSaveCleaner.Structures">
+                    xmlns:structures="clr-namespace:RegulSaveCleaner.Structures"
+                    x:ClassModifier="internal">
     <MenuFlyout x:Key="SaveFilesSettingsMenuFlyout" x:DataType="structures:GameSave">
         <MenuItem Header="{StaticResource ProhibitedList}"
                   Command="{CompiledBinding $parent[views:MainWindow].ViewModel.OpenProhibitedList}"

diff --git a/RegulSaveCleaner/ViewModels/Windows/ProhibitedListViewModel.cs b/RegulSaveCleaner/ViewModels/Windows/ProhibitedListViewModel.cs
@@ -13,8 +13,10 @@
 using RegulSaveCleaner.S3PI.Resources;
 using RegulSaveCleaner.Structures;
 using RegulSaveCleaner.Views.Windows;
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.PixelFormats;
 using IImage = Pfim.IImage;
 
 namespace RegulSaveCleaner.ViewModels.Windows;

diff --git a/RegulSaveCleaner/Views/Pages/AboutPage.axaml b/RegulSaveCleaner/Views/Pages/AboutPage.axaml
@@ -130,7 +130,7 @@
                                        HorizontalAlignment="Right"
                                        Foreground="{StaticResource TextFillColorTertiaryBrush}">
                                 <Run Text="{StaticResource Version}" /><Run Text=":" />
-                                &#8203;<Run Text="11.0.0" />
+                                &#8203;<Run Text="11.0.1" />
                             </TextBlock>
                         </Panel>
                         <Separator Background="{StaticResource CardStrokeColorDefaultBrush}" Margin="-12 0" />