feat: update to latest changes and increase version

MahApps · Jun 6, 2024 · 600642a · 600642a
1 parent 8f4429c
commit 600642a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,11 +20,9 @@ on:
   push:
     branches:
       - main
-      - develop
   pull_request:
     branches:
       - main
-      - develop
 
 jobs:
   windows-latest:

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1,6 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
-next-version: 1.0.0
+next-version: 2.0.0
 mode: ContinuousDeployment
 branches:
   master:

diff --git a/NuGet.Config b/NuGet.Config
@@ -10,6 +10,7 @@
   <packageSources>
     <clear />
     <!-- <add key="CI.MahApps.IconPacks" value="d:\source\github_orgs\MahApps.Metro.IconPacks\Publish\" /> -->
+    <add key="CI.MahApps.IconPacks" value="https://ci.appveyor.com/nuget/mahapps-metro-iconpacks-jrmm48owpkp2" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
   <activePackageSource>
@@ -18,7 +19,7 @@
   </activePackageSource>
   <packageSourceMapping>
     <!-- <packageSource key="CI.MahApps.IconPacks">
-      <package pattern="*" />
+      <package pattern="MahApps.Metro.IconPacks*" />
     </packageSource> -->
     <packageSource key="nuget.org">
       <package pattern="*" />

diff --git a/build/Build.cs b/build/Build.cs
@@ -5,7 +5,6 @@
 using Nuke.Common;
 using Nuke.Common.CI;
 using Nuke.Common.CI.GitHubActions;
-using Nuke.Common.Execution;
 using Nuke.Common.Git;
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
@@ -26,8 +25,8 @@
     GitHubActionsImage.WindowsLatest,
     AutoGenerate = true,
     FetchDepth = 0,
-    OnPushBranches = new[] { "main", "develop" },
-    OnPullRequestBranches = new[] { "main", "develop" },
+    OnPushBranches = new[] { "main" },
+    OnPullRequestBranches = new[] { "main" },
     InvokedTargets = new[] { nameof(Compile) }
 )]
 [GitHubActions(
@@ -69,7 +68,9 @@ protected override void OnBuildInitialized()
             throw new Exception("Could not initialize GitVersion.");
         }
 
+#pragma warning disable CS0612 // Type or member is obsolete
         Logger.Block("Info");
+#pragma warning restore CS0612 // Type or member is obsolete
 
         Log.Information("IsLocalBuild           : {IsLocalBuild}", IsLocalBuild.ToString());
         Log.Information("Branch                 : {Branch}", GitRepository.Branch);
@@ -86,7 +87,7 @@ protected override void OnBuildInitialized()
 
     [Solution(GenerateProjects = true, SuppressBuildProjectCheck = false)] readonly Solution Solution;
     [GitRepository] readonly GitRepository GitRepository;
-    [GitVersion(Framework = "net5.0", NoFetch = true)] readonly GitVersion GitVersion;
+    [GitVersion(Framework = "net6.0", NoFetch = true)] readonly GitVersion GitVersion;
 
     AbsolutePath SourceDirectory => RootDirectory / "src";
     AbsolutePath TestsDirectory => RootDirectory / "tests";

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.200",
+    "version": "8.0.100",
     "rollForward": "feature"
   }
 }
diff --git a/src/IconPacks.Browser/IconPacks.Browser.csproj b/src/IconPacks.Browser/IconPacks.Browser.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net47;net6.0-windows</TargetFrameworks>
+        <TargetFrameworks>net8.0-windows;net6.0-windows;net47</TargetFrameworks>
         <OutputType>WinExe</OutputType>
         <UseWPF>true</UseWPF>
         <AssemblyName>IconPacks.Browser</AssemblyName>
@@ -24,7 +24,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="MahApps.Metro.IconPacks" Version="5.0.0-*" />
+        <PackageReference Include="MahApps.Metro.IconPacks" Version="5.0.0" />
         <PackageReference Include="MahApps.Metro" Version="2.4.10" />
         <PackageReference Include="AsyncAwaitBestPractices" Version="6.0.6" />
         <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />

diff --git a/src/IconPacks.Browser/ViewModels/IconPackViewModel.cs b/src/IconPacks.Browser/ViewModels/IconPackViewModel.cs
@@ -21,7 +21,7 @@
 using MahApps.Metro.Controls.Dialogs;
 using MahApps.Metro.IconPacks;
 using Microsoft.Win32;
-using io = System.IO;
+using IO = System.IO;
 
 namespace IconPacks.Browser.ViewModels
 {
@@ -253,7 +253,7 @@ private async void SaveAsSvg_Execute()
 
                     var svgFileContent = ExportHelper.FillTemplate(svgFileTemplate, parameters);
 
-                    using io.StreamWriter file = new io.StreamWriter(fileSaveDialog.FileName);
+                    using IO.StreamWriter file = new IO.StreamWriter(fileSaveDialog.FileName);
                     await file.WriteAsync(svgFileContent);
                 }
             }
@@ -317,7 +317,7 @@ private async void SaveAsWpf_Execute()
 
                     var wpfFileContent = ExportHelper.FillTemplate(wpfFileTemplate, parameters);
 
-                    using io.StreamWriter file = new io.StreamWriter(fileSaveDialog.FileName);
+                    using IO.StreamWriter file = new IO.StreamWriter(fileSaveDialog.FileName);
                     await file.WriteAsync(wpfFileContent);
                 }
             }
@@ -380,7 +380,7 @@ private async void SaveAsUwp_Execute()
 
                     var wpfFileContent = ExportHelper.FillTemplate(wpfFileTemplate, parameters);
 
-                    using io.StreamWriter file = new io.StreamWriter(fileSaveDialog.FileName);
+                    using IO.StreamWriter file = new IO.StreamWriter(fileSaveDialog.FileName);
                     await file.WriteAsync(wpfFileContent);
                 }
             }
@@ -450,7 +450,7 @@ private async void SaveAsBitmapExecute(BitmapEncoder encoder)
 
                     encoder.Frames.Add(BitmapFrame.Create(renderTargetBitmap));
 
-                    using var fileStream = new io.FileStream(fileSaveDialog.FileName, io.FileMode.Create);
+                    using var fileStream = new IO.FileStream(fileSaveDialog.FileName, IO.FileMode.Create);
                     encoder.Save(fileStream);
                 }
             }

diff --git a/src/IconPacks.Browser/ViewModels/MainViewModel.cs b/src/IconPacks.Browser/ViewModels/MainViewModel.cs
@@ -62,6 +62,7 @@ public MainViewModel(Dispatcher dispatcher)
                     (typeof(PackIconMicronsKind), typeof(PackIconMicrons)),
                     (typeof(PackIconModernKind), typeof(PackIconModern)),
                     (typeof(PackIconOcticonsKind), typeof(PackIconOcticons)),
+                    (typeof(PackIconPhosphorIconsKind), typeof(PackIconPhosphorIcons)),
                     (typeof(PackIconPicolIconsKind), typeof(PackIconPicolIcons)),
                     (typeof(PackIconPixelartIconsKind), typeof(PackIconPixelartIcons)),
                     (typeof(PackIconRadixIconsKind), typeof(PackIconRadixIcons)),