Merge branch 'develop'

Author: punker76

GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
-next-version: 5.2.0
+next-version: 6.0.0
 mode: ContinuousDeployment
 branches:
   master:

README.md

@@ -6,12 +6,26 @@
 
     <!-- Project properties -->
     <PropertyGroup>
-        <TargetFrameworks>net8.0-windows;net6.0-windows;net47;net462;uap10.0.18362</TargetFrameworks>
+        <!--<TargetFrameworks>net8.0-windows;net6.0-windows;net47;net462;uap10.0.18362</TargetFrameworks>-->
+        <TargetFrameworks>net8.0-windows;net6.0-windows;net47;net462</TargetFrameworks>
+
+		<IsUwp Condition="'$(IsUwp)'==''">false</IsUwp>
+		<IsUwp Condition="$(TargetFramework.Contains('10.0'))">true</IsUwp>
+		<IsWpf Condition="'$(IsWpf)'==''">false</IsWpf>
+		<IsWpf Condition="'$(IsUwp)' == 'false'">true</IsWpf>
+
+        <IsBuildingForLegacyFramework>false</IsBuildingForLegacyFramework>
+        <IsBuildingForLegacyFramework Condition="$(TargetFramework.StartsWith('net4'))">true</IsBuildingForLegacyFramework>
+
+        <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsAotCompatible>
+
         <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <GenerateLibraryLayout>true</GenerateLibraryLayout>
-        <AutoGenerateBindingRedirects Condition=" $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('uap')) ">true</AutoGenerateBindingRedirects>
+        <AutoGenerateBindingRedirects Condition="'$(IsBuildingForLegacyFramework)' == 'true' or '$(IsUwp)' == 'true'">true</AutoGenerateBindingRedirects>
+
         <LangVersion>latest</LangVersion>
+
         <NoWarn>$(NoWarn);CS1591;CS0618</NoWarn>
         <NoError>$(NoError);CS1591;CS0618</NoError>
     </PropertyGroup>
@@ -22,12 +36,12 @@
     </PropertyGroup>
 
     <!-- .NET Framework and Core -->
-    <PropertyGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
+    <PropertyGroup Condition="'$(IsWpf)' == 'true'">
         <UseWpf>true</UseWpf>
     </PropertyGroup>
 
     <!-- UAP -->
-    <PropertyGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
+    <PropertyGroup Condition="'$(IsUwp)' == 'true'">
         <DefaultTargetPlatformVersion>18362</DefaultTargetPlatformVersion>
         <DefaultTargetPlatformMinVersion>18362</DefaultTargetPlatformMinVersion>
         <UseWindowsDesktopSdk>true</UseWindowsDesktopSdk>
@@ -36,9 +50,6 @@
         <!-- This is valid for platforms other than .NET Framework (and is needed for the UWP targets -->
         <NoWarn>$(NoWarn);8002;CS0618</NoWarn>
         <NoError>$(NoError);CS0618</NoError>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" $(TargetFramework.StartsWith('uap')) and '$(Configuration)' == 'Release' ">
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 

src/Directory.build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras">
-    <!-- Project properties -->
-    <PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
         <DefineConstants>$(DefineConstants);BOOTSTRAPICONS</DefineConstants>
         <IconsName>BootstrapIcons</IconsName>
         <AssemblyName>MahApps.Metro.IconPacks.BootstrapIcons</AssemblyName>
@@ -19,14 +19,14 @@
     </ItemGroup>
 
     <!-- WPF Items include -->
-    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
+    <ItemGroup Condition="'$(IsWpf)' == 'true'">
         <None Remove="**\*.rd.xml" />
         <Compile Remove="Path*.*" />
         <Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
     </ItemGroup>
 
     <!-- UWP Items include -->
-    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
+    <ItemGroup Condition="'$(IsUwp)' == 'true'">
         <Compile Remove="*Image*.cs;*Cursor*.cs" />
         <Compile Remove="Themes\**\*.*" />
         <EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />

src/MahApps.Metro.IconPacks.BootstrapIcons/MahApps.Metro.IconPacks.BootstrapIcons.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras">
-    <!-- Project properties -->
-    <PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
         <DefineConstants>$(DefineConstants);BOXICONS</DefineConstants>
         <IconsName>BoxIcons</IconsName>
         <AssemblyName>MahApps.Metro.IconPacks.BoxIcons</AssemblyName>
@@ -19,14 +19,14 @@
     </ItemGroup>
 
     <!-- WPF Items include -->
-    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
+    <ItemGroup Condition="'$(IsWpf)' == 'true'">
         <None Remove="**\*.rd.xml" />
         <Compile Remove="Path*.*" />
         <Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
     </ItemGroup>
 
     <!-- UWP Items include -->
-    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
+    <ItemGroup Condition="'$(IsUwp)' == 'true'">
         <Compile Remove="*Image*.cs;*Cursor*.cs" />
         <Compile Remove="Themes\**\*.*" />
         <EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />

src/MahApps.Metro.IconPacks.BootstrapIcons/PackIconBootstrapIconsKind.cs

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras">
-    <!-- Project properties -->
-    <PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
         <DefineConstants>$(DefineConstants);CIRCUMICONS</DefineConstants>
         <IconsName>CircumIcons</IconsName>
         <AssemblyName>MahApps.Metro.IconPacks.CircumIcons</AssemblyName>
@@ -19,14 +19,14 @@
     </ItemGroup>
 
     <!-- WPF Items include -->
-    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
+    <ItemGroup Condition="'$(IsWpf)' == 'true'">
         <None Remove="**\*.rd.xml" />
         <Compile Remove="Path*.*" />
         <Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
     </ItemGroup>
 
     <!-- UWP Items include -->
-    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
+    <ItemGroup Condition="'$(IsUwp)' == 'true'">
         <Compile Remove="*Image*.cs;*Cursor*.cs" />
         <Compile Remove="Themes\**\*.*" />
         <EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />

src/MahApps.Metro.IconPacks.BootstrapIcons/Resources/Icons.json

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras">
-    <!-- Project properties -->
-    <PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
         <DefineConstants>$(DefineConstants);CODICONS</DefineConstants>
         <IconsName>Codicons</IconsName>
         <AssemblyName>MahApps.Metro.IconPacks.Codicons</AssemblyName>
@@ -19,14 +19,14 @@
     </ItemGroup>
 
     <!-- WPF Items include -->
-    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
+    <ItemGroup Condition="'$(IsWpf)' == 'true'">
         <None Remove="**\*.rd.xml" />
         <Compile Remove="Path*.*" />
         <Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" />
     </ItemGroup>
 
     <!-- UWP Items include -->
-    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
+    <ItemGroup Condition="'$(IsUwp)' == 'true'">
         <Compile Remove="*Image*.cs;*Cursor*.cs" />
         <Compile Remove="Themes\**\*.*" />
         <EmbeddedResource Include="Properties\$(AssemblyName).rd.xml" />

src/MahApps.Metro.IconPacks.BoxIcons/MahApps.Metro.IconPacks.BoxIcons.csproj

@@ -36,6 +36,7 @@ public enum PackIconCodiconsKind
         [Description("arrow-small-up (EAA0)")] ArrowSmallUp,
         [Description("arrow-swap (EBCB)")] ArrowSwap,
         [Description("arrow-up (EAA1)")] ArrowUp,
+        [Description("attach (EC34)")] Attach,
         [Description("azure (EBD8)")] Azure,
         [Description("azure-devops (EBE8)")] AzureDevops,
         [Description("beaker (EA79)")] Beaker,
@@ -57,6 +58,7 @@ public enum PackIconCodiconsKind
         [Description("call-incoming (EB92)")] CallIncoming,
         [Description("call-outgoing (EB93)")] CallOutgoing,
         [Description("case-sensitive (EAB1)")] CaseSensitive,
+        [Description("chat-sparkle (EC4F)")] ChatSparkle,
         [Description("check (EAB2)")] Check,
         [Description("check-all (EBB1)")] CheckAll,
         [Description("checklist (EAB3)")] Checklist,
@@ -86,6 +88,7 @@ public enum PackIconCodiconsKind
         [Description("cloud-upload (EAC3)")] CloudUpload,
         [Description("code (EAC4)")] Code,
         [Description("code-oss (EC2B)")] CodeOss,
+        [Description("code-review (EC37)")] CodeReview,
         [Description("coffee (EC15)")] Coffee,
         [Description("collapse-all (EAC5)")] CollapseAll,
         [Description("color-mode (EAC6)")] ColorMode,
@@ -98,6 +101,16 @@ public enum PackIconCodiconsKind
         [Description("compass-active (EBD7)")] CompassActive,
         [Description("compass-dot (EBD6)")] CompassDot,
         [Description("copilot (EC1E)")] Copilot,
+        [Description("copilot-blocked (EC3D)")] CopilotBlocked,
+        [Description("copilot-error (EC4D)")] CopilotError,
+        [Description("copilot-in-progress (EC4C)")] CopilotInProgress,
+        [Description("copilot-large (EC3A)")] CopilotLarge,
+        [Description("copilot-not-connected (EC3E)")] CopilotNotConnected,
+        [Description("copilot-snooze (EC52)")] CopilotSnooze,
+        [Description("copilot-success (EC4E)")] CopilotSuccess,
+        [Description("copilot-unavailable (EC42)")] CopilotUnavailable,
+        [Description("copilot-warning (EC38)")] CopilotWarning,
+        [Description("copilot-warning-large (EC3B)")] CopilotWarningLarge,
         [Description("copy (EBCC)")] Copy,
         [Description("coverage (EC2E)")] Coverage,
         [Description("credit-card (EAC9)")] CreditCard,
@@ -147,10 +160,12 @@ public enum PackIconCodiconsKind
         [Description("diff-multiple (EC23)")] DiffMultiple,
         [Description("diff-removed (EADF)")] DiffRemoved,
         [Description("diff-renamed (EAE0)")] DiffRenamed,
-        [Description("diff-single (EC22)")] DiffSingle,
+        [Description("diff-single (EB43)")] DiffSingle,
         [Description("discard (EAE2)")] Discard,
         [Description("edit (EA73)")] Edit,
         [Description("editor-layout (EAE3)")] EditorLayout,
+        [Description("edit-session (EC36)")] EditSession,
+        [Description("edit-sparkle (EC51)")] EditSparkle,
         [Description("ellipsis (EA7C)")] Ellipsis,
         [Description("empty-window (EAE4)")] EmptyWindow,
         [Description("error (EA87)")] Error,
@@ -159,6 +174,7 @@ public enum PackIconCodiconsKind
         [Description("expand-all (EB95)")] ExpandAll,
         [Description("export (EBAC)")] Export,
         [Description("extensions (EAE6)")] Extensions,
+        [Description("extensions-large (EC48)")] ExtensionsLarge,
         [Description("eye (EA70)")] Eye,
         [Description("eye-closed (EAE7)")] EyeClosed,
         [Description("feedback (EB96)")] Feedback,
@@ -174,6 +190,7 @@ public enum PackIconCodiconsKind
         [Description("file-zip (EAEF)")] FileZip,
         [Description("filter (EAF1)")] Filter,
         [Description("filter-filled (EBCE)")] FilterFilled,
+        [Description("flag (EC3F)")] Flag,
         [Description("flame (EAF2)")] Flame,
         [Description("fold (EAF5)")] Fold,
         [Description("fold-down (EAF3)")] FoldDown,
@@ -185,7 +202,7 @@ public enum PackIconCodiconsKind
         [Description("game (EC17)")] Game,
         [Description("gear (EAF8)")] Gear,
         [Description("gift (EAF9)")] Gift,
-        [Description("gist (F1AA)")] Gist,
+        [Description("gist (EAFB)")] Gist,
         [Description("gist-secret (EAFA)")] GistSecret,
         [Description("git-commit (EAFC)")] GitCommit,
         [Description("git-compare (EAFD)")] GitCompare,
@@ -199,13 +216,15 @@ public enum PackIconCodiconsKind
         [Description("git-pull-request (EA64)")] GitPullRequest,
         [Description("git-pull-request-closed (EBDA)")] GitPullRequestClosed,
         [Description("git-pull-request-create (EBBC)")] GitPullRequestCreate,
+        [Description("git-pull-request-done (EC46)")] GitPullRequestDone,
         [Description("git-pull-request-draft (EBDB)")] GitPullRequestDraft,
         [Description("git-pull-request-go-to-changes (EC0B)")] GitPullRequestGoToChanges,
         [Description("git-pull-request-new-changes (EC0C)")] GitPullRequestNewChanges,
         [Description("git-stash (EC26)")] GitStash,
         [Description("git-stash-apply (EC27)")] GitStashApply,
         [Description("git-stash-pop (EC28)")] GitStashPop,
         [Description("globe (EB01)")] Globe,
+        [Description("go-to-editing-session (EC35)")] GoToEditingSession,
         [Description("go-to-file (EA94)")] GoToFile,
         [Description("go-to-search (EC32)")] GoToSearch,
         [Description("grabber (EB02)")] Grabber,
@@ -234,6 +253,9 @@ public enum PackIconCodiconsKind
         [Description("json (EB0F)")] Json,
         [Description("kebab-vertical (EB10)")] KebabVertical,
         [Description("key (EB11)")] Key,
+        [Description("keyboard-tab (EC3C)")] KeyboardTab,
+        [Description("keyboard-tab-above (EC44)")] KeyboardTabAbove,
+        [Description("keyboard-tab-below (EC45)")] KeyboardTabBelow,
         [Description("law (EB12)")] Law,
         [Description("layers (EBD2)")] Layers,
         [Description("layers-active (EBD4)")] LayersActive,
@@ -245,18 +267,22 @@ public enum PackIconCodiconsKind
         [Description("layout-menubar (EBF6)")] LayoutMenubar,
         [Description("layout-panel (EBF2)")] LayoutPanel,
         [Description("layout-panel-center (EBEF)")] LayoutPanelCenter,
+        [Description("layout-panel-dock (EC49)")] LayoutPanelDock,
         [Description("layout-panel-justify (EBF0)")] LayoutPanelJustify,
         [Description("layout-panel-left (EBEE)")] LayoutPanelLeft,
         [Description("layout-panel-off (EC01)")] LayoutPanelOff,
         [Description("layout-panel-right (EBF1)")] LayoutPanelRight,
         [Description("layout-sidebar-left (EBF3)")] LayoutSidebarLeft,
+        [Description("layout-sidebar-left-dock (EC4A)")] LayoutSidebarLeftDock,
         [Description("layout-sidebar-left-off (EC02)")] LayoutSidebarLeftOff,
         [Description("layout-sidebar-right (EBF4)")] LayoutSidebarRight,
+        [Description("layout-sidebar-right-dock (EC4B)")] LayoutSidebarRightDock,
         [Description("layout-sidebar-right-off (EC00)")] LayoutSidebarRightOff,
         [Description("layout-statusbar (EBF5)")] LayoutStatusbar,
         [Description("library (EB9C)")] Library,
         [Description("lightbulb (EA61)")] Lightbulb,
         [Description("lightbulb-autofix (EB13)")] LightbulbAutofix,
+        [Description("lightbulb-empty (EC40)")] LightbulbEmpty,
         [Description("lightbulb-sparkle (EC1F)")] LightbulbSparkle,
         [Description("link (EB15)")] Link,
         [Description("link-external (EB14)")] LinkExternal,
@@ -279,6 +305,7 @@ public enum PackIconCodiconsKind
         [Description("map-vertical (EC30)")] MapVertical,
         [Description("map-vertical-filled (EC31)")] MapVerticalFilled,
         [Description("markdown (EB1D)")] Markdown,
+        [Description("mcp (EC47)")] Mcp,
         [Description("megaphone (EB1E)")] Megaphone,
         [Description("mention (EB1F)")] Mention,
         [Description("menu (EB94)")] Menu,
@@ -323,6 +350,7 @@ public enum PackIconCodiconsKind
         [Description("primitive-square (EA72)")] PrimitiveSquare,
         [Description("project (EB30)")] Project,
         [Description("pulse (EB31)")] Pulse,
+        [Description("python (EC39)")] Python,
         [Description("question (EB32)")] Question,
         [Description("quote (EB33)")] Quote,
         [Description("radio-tower (EB34)")] RadioTower,
@@ -345,10 +373,11 @@ public enum PackIconCodiconsKind
         [Description("repo-fetch (EC1D)")] RepoFetch,
         [Description("repo-force-push (EB3F)")] RepoForcePush,
         [Description("repo-forked (EA63)")] RepoForked,
+        [Description("repo-pinned (EC43)")] RepoPinned,
         [Description("repo-pull (EB40)")] RepoPull,
         [Description("repo-push (EB41)")] RepoPush,
         [Description("report (EB42)")] Report,
-        [Description("request-changes (EB43)")] RequestChanges,
+        [Description("request-changes (F269)")] RequestChanges,
         [Description("robot (EC20)")] Robot,
         [Description("rocket (EB44)")] Rocket,
         [Description("root-folder (EB46)")] RootFolder,
@@ -368,6 +397,7 @@ public enum PackIconCodiconsKind
         [Description("screen-normal (EB4D)")] ScreenNormal,
         [Description("search (EA6D)")] Search,
         [Description("search-fuzzy (EC0D)")] SearchFuzzy,
+        [Description("search-sparkle (EC50)")] SearchSparkle,
         [Description("search-stop (EB4E)")] SearchStop,
         [Description("send (EC0F)")] Send,
         [Description("server (EB50)")] Server,
@@ -402,11 +432,12 @@ public enum PackIconCodiconsKind
         [Description("symbol-enum-member (EB5E)")] SymbolEnumMember,
         [Description("symbol-event (EA86)")] SymbolEvent,
         [Description("symbol-field (EB5F)")] SymbolField,
-        [Description("symbol-file (EB60)")] SymbolFile,
+        [Description("symbol-file (F2A0)")] SymbolFile,
         [Description("symbol-interface (EB61)")] SymbolInterface,
         [Description("symbol-key (EA93)")] SymbolKey,
         [Description("symbol-keyword (EB62)")] SymbolKeyword,
         [Description("symbol-method (EA8C)")] SymbolMethod,
+        [Description("symbol-method-arrow (EC41)")] SymbolMethodArrow,
         [Description("symbol-misc (EB63)")] SymbolMisc,
         [Description("symbol-namespace (EA8B)")] SymbolNamespace,
         [Description("symbol-numeric (EA90)")] SymbolNumeric,