Browse Source

Migrated to MdXaml from Markdown.Xaml (its newer and isnt .net framework-based)

also removed unused usings
pull/5/head
JT 1 year ago
parent
commit
2853723652
  1. 7
      StabilityMatrix/CheckpointManagerPage.xaml.cs
  2. 1
      StabilityMatrix/Helper/ArchiveHelper.cs
  3. 1
      StabilityMatrix/Helper/IPackageFactory.cs
  4. 1
      StabilityMatrix/Helper/PackageFactory.cs
  5. 8
      StabilityMatrix/Helper/PrerequisiteHelper.cs
  6. 2
      StabilityMatrix/InstallerWindow.xaml
  7. 2
      StabilityMatrix/InstallerWindow.xaml.cs
  8. 1
      StabilityMatrix/Models/CheckpointFile.cs
  9. 1
      StabilityMatrix/Models/CheckpointFolder.cs
  10. 2
      StabilityMatrix/Models/LaunchOption.cs
  11. 4
      StabilityMatrix/Models/Packages/BaseGitPackage.cs
  12. 2
      StabilityMatrix/SettingsPage.xaml
  13. 2
      StabilityMatrix/SettingsPage.xaml.cs
  14. 2
      StabilityMatrix/StabilityMatrix.csproj
  15. 1
      StabilityMatrix/ViewModels/OneClickInstallViewModel.cs
  16. 3
      StabilityMatrix/ViewModels/SettingsViewModel.cs

7
StabilityMatrix/CheckpointManagerPage.xaml.cs

@ -1,12 +1,7 @@
using System.Diagnostics;
using System.Threading;
using System.Windows;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Effects;
using StabilityMatrix.ViewModels;
using Wpf.Ui.Controls;
namespace StabilityMatrix;

1
StabilityMatrix/Helper/ArchiveHelper.cs

@ -1,5 +1,4 @@
using System;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Text.RegularExpressions;

1
StabilityMatrix/Helper/IPackageFactory.cs

@ -1,5 +1,4 @@
using System.Collections.Generic;
using StabilityMatrix.Models;
using StabilityMatrix.Models.Packages;
namespace StabilityMatrix.Helper;

1
StabilityMatrix/Helper/PackageFactory.cs

@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using StabilityMatrix.Models;
using StabilityMatrix.Models.Packages;
namespace StabilityMatrix.Helper;

8
StabilityMatrix/Helper/PrerequisiteHelper.cs

@ -1,19 +1,11 @@
using System;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Threading;
using Microsoft.Extensions.Logging;
using Octokit;
using SharpCompress.Archives;
using SharpCompress.Common;
using SharpCompress.Factories;
using SharpCompress.Readers;
using StabilityMatrix.Models;
using StabilityMatrix.Services;
using Application = System.Windows.Application;
namespace StabilityMatrix.Helper;

2
StabilityMatrix/InstallerWindow.xaml

@ -27,7 +27,7 @@
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:viewModels="clr-namespace:StabilityMatrix.ViewModels"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:xaml="clr-namespace:Markdown.Xaml;assembly=Markdown.Xaml">
xmlns:xaml="clr-namespace:MdXaml;assembly=MdXaml">
<ui:FluentWindow.Resources>
<converters:ValueConverterGroup x:Key="InvertAndVisibilitate">

2
StabilityMatrix/InstallerWindow.xaml.cs

@ -1,6 +1,4 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using StabilityMatrix.Services;
using StabilityMatrix.ViewModels;
using Wpf.Ui.Controls.Window;

1
StabilityMatrix/Models/CheckpointFile.cs

@ -4,7 +4,6 @@ using System.Collections.Immutable;
using System.IO;
using System.Linq;
using System.Windows.Media.Imaging;
using CommunityToolkit.Mvvm.ComponentModel;
namespace StabilityMatrix.Models;

1
StabilityMatrix/Models/CheckpointFolder.cs

@ -1,7 +1,6 @@
using System;
using System.Collections.ObjectModel;
using System.Threading.Tasks;
using CommunityToolkit.Mvvm.ComponentModel;
namespace StabilityMatrix.Models;

2
StabilityMatrix/Models/LaunchOption.cs

@ -1,7 +1,5 @@
using System;
using System.Text.Json;
using System.Text.Json.Serialization;
using CommunityToolkit.Mvvm.ComponentModel;
using StabilityMatrix.Converters.Json;
using StabilityMatrix.Helper;

4
StabilityMatrix/Models/Packages/BaseGitPackage.cs

@ -4,9 +4,6 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
using NLog;
using Octokit;
@ -15,7 +12,6 @@ using StabilityMatrix.Helper.Cache;
using StabilityMatrix.Python;
using StabilityMatrix.Services;
using ApiException = Refit.ApiException;
using FileMode = System.IO.FileMode;
namespace StabilityMatrix.Models.Packages;

2
StabilityMatrix/SettingsPage.xaml

@ -18,7 +18,7 @@
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:viewModels="clr-namespace:StabilityMatrix.ViewModels"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:xaml="clr-namespace:Markdown.Xaml;assembly=Markdown.Xaml">
xmlns:xaml="clr-namespace:MdXaml;assembly=MdXaml">
<Page.Resources>
<xaml:Markdown

2
StabilityMatrix/SettingsPage.xaml.cs

@ -1,5 +1,5 @@
using System.Windows;
using Markdown.Xaml;
using MdXaml;
using StabilityMatrix.ViewModels;
using Wpf.Ui.Controls.Navigation;

2
StabilityMatrix/StabilityMatrix.csproj

@ -14,7 +14,7 @@
<PackageReference Include="7-Zip.CommandLine" Version="18.1.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
<PackageReference Include="FuzzySharp" Version="2.0.2" />
<PackageReference Include="Markdown.Xaml" Version="1.0.0" />
<PackageReference Include="MdXaml" Version="1.19.2" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />

1
StabilityMatrix/ViewModels/OneClickInstallViewModel.cs

@ -8,7 +8,6 @@ using StabilityMatrix.Helper;
using StabilityMatrix.Models;
using StabilityMatrix.Models.Packages;
using StabilityMatrix.Python;
using StabilityMatrix.Services;
using EventManager = StabilityMatrix.Helper.EventManager;
namespace StabilityMatrix.ViewModels;

3
StabilityMatrix/ViewModels/SettingsViewModel.cs

@ -9,11 +9,10 @@ using System.Text.Json;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Markdown.Xaml;
using MdXaml;
using Ookii.Dialogs.Wpf;
using StabilityMatrix.Api;
using StabilityMatrix.Helper;

Loading…
Cancel
Save