- Generated New Signing certificate

- updated .net to 9 preview - fixed crash on launch - integrated fixes from #1217 - Updated Nuget Packages
ModernFlyouts-Community · Nov 12, 2024 · f2551ec · f2551ec
1 parent a33113d
commit f2551ec
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 29 deletions.
diff --git a/ModernFlyouts.Core/Interop/NativeFlyoutHandler.cs b/ModernFlyouts.Core/Interop/NativeFlyoutHandler.cs
@@ -352,7 +352,7 @@ private bool GetAllInfos()
             String outerName = "";
             String innerClass = "";
             String innerName = "";
-            if (buildNumber >= 22000)
+            if (buildNumber >= 22620) // 22H2 changes the OSD
             {
                 outerClass = "XamlExplorerHostIslandWindow";
                 innerClass = "Windows.UI.Composition.DesktopWindowContentBridge";

diff --git a/ModernFlyouts.Core/ModernFlyouts.Core.csproj b/ModernFlyouts.Core/ModernFlyouts.Core.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
     <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win10-x64;win10-x86;win10-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
 				<LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="7.1.0" />
-    <PackageReference Include="NAudio" Version="2.2.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+    <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="NPSMLib" Version="0.9.14" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
-    <PackageReference Include="System.Management" Version="7.0.2" />
+    <PackageReference Include="System.Drawing.Common" Version="9.0.0-rc.2.24474.1" />
+    <PackageReference Include="System.Management" Version="9.0.0-rc.2.24473.5" />
   </ItemGroup>
 
 </Project>
diff --git a/ModernFlyouts.Package/ModernFlyouts.Package.wapproj b/ModernFlyouts.Package/ModernFlyouts.Package.wapproj
@@ -41,7 +41,7 @@
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
@@ -122,9 +122,12 @@
     <ProjectReference Include="..\ModernFlyoutsHost\ModernFlyoutsHost.vcxproj" />
     <ProjectReference Include="..\ModernFlyouts\ModernFlyouts.csproj">
       <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-      <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
+      <PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Management" Version="9.0.0-rc.2.24473.5" />
+  </ItemGroup>
   <Target Name="FlattenPackage" BeforeTargets="_ConvertItems">
     <ItemGroup>
       <_TemporaryFilteredWapProjOutput Include="@(_FilteredNonWapProjProjectOutput)" />

diff --git a/ModernFlyouts.Package/Package.appxmanifest b/ModernFlyouts.Package/Package.appxmanifest
@@ -11,7 +11,7 @@
   <Identity
     Name="32669SamG.ModernFlyouts"
     Publisher="CN=samue"
-    Version="0.9.8513.0" />
+    Version="0.9.8622.0" />
 
   <Properties>
     <DisplayName>ms-resource:Resources/PackageDisplayName</DisplayName>
@@ -78,7 +78,7 @@
       <Extensions>
         <uap5:Extension
             Category="windows.startupTask"
-            Executable="ModernFlyoutsHost.exe"
+            Executable="ModernFlyouts.exe"
             EntryPoint="Windows.FullTrustApplication">
           <uap5:StartupTask
             TaskId="ModernFlyoutsStartupId"

diff --git a/ModernFlyouts/ModernFlyouts.csproj b/ModernFlyouts/ModernFlyouts.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
     <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win10-x64;win10-x86;win10-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <OutputType>WinExe</OutputType>
     <NeutralLanguage>en-US</NeutralLanguage>
@@ -24,17 +24,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+    <!--<PackageReference Include="H.NotifyIcon.Wpf" Version="2.1.4" />-->
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageReference Include="ModernWpf.Toolkit.UI.Controls" Version="0.1.0" />
     <PackageReference Include="ModernWpfUI" Version="0.9.6" />
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf.NetCore" Version="1.0.18" />
+    <PackageReference Include="System.Drawing.Common" Version="9.0.0-rc.2.24474.1" />
+    <PackageReference Include="System.Management" Version="9.0.0-rc.2.24473.5" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <PackageReference Include="Microsoft.AppCenter" Version="4.3.0" />
-    <PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.3.0" />
-    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.3.0" />
+    <PackageReference Include="Microsoft.AppCenter" Version="5.0.6" />
+    <PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.6" />
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
     <PackageReference Include="Microsoft.Services.Store.SDK" Version="10.1705.16001" />
   </ItemGroup>
 

diff --git a/...erties/PublishProfiles/win10-arm64.pubxml → ...operties/PublishProfiles/win-arm64.pubxml b/...erties/PublishProfiles/win10-arm64.pubxml → ...operties/PublishProfiles/win-arm64.pubxml
@@ -8,11 +8,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>arm64</Platform>
 				<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
-    <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
+    <TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
+    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
 						<SelfContained>true</SelfContained>
 						<PublishSingleFile>True</PublishSingleFile>
-						<PublishReadyToRun>False</PublishReadyToRun>
+						<PublishReadyToRun>True</PublishReadyToRun>
 						<PublishTrimmed>False</PublishTrimmed>
 						<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
   </PropertyGroup>

diff --git a/...operties/PublishProfiles/win10-x64.pubxml → ...Properties/PublishProfiles/win-x64.pubxml b/...operties/PublishProfiles/win10-x64.pubxml → ...Properties/PublishProfiles/win-x64.pubxml
@@ -8,11 +8,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>x64</Platform>
 				<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 						<SelfContained>true</SelfContained>
 						<PublishSingleFile>True</PublishSingleFile>
-						<PublishReadyToRun>False</PublishReadyToRun>
+						<PublishReadyToRun>True</PublishReadyToRun>
 						<PublishTrimmed>False</PublishTrimmed>
 						<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
   </PropertyGroup>

diff --git a/...operties/PublishProfiles/win10-x86.pubxml → ...Properties/PublishProfiles/win-x86.pubxml b/...operties/PublishProfiles/win10-x86.pubxml → ...Properties/PublishProfiles/win-x86.pubxml
@@ -8,11 +8,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>x86</Platform>
 				<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
-    <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
+    <TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
 						<SelfContained>true</SelfContained>
 						<PublishSingleFile>True</PublishSingleFile>
-						<PublishReadyToRun>False</PublishReadyToRun>
+						<PublishReadyToRun>True</PublishReadyToRun>
 						<PublishTrimmed>False</PublishTrimmed>
 						<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
   </PropertyGroup>

diff --git a/ModernFlyoutsBridge/ModernFlyoutsBridge.vcxproj b/ModernFlyoutsBridge/ModernFlyoutsBridge.vcxproj
@@ -37,7 +37,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/ModernFlyoutsHost/ModernFlyoutsHost.vcxproj b/ModernFlyoutsHost/ModernFlyoutsHost.vcxproj
@@ -37,7 +37,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />