Skip to content
This repository was archived by the owner on Nov 15, 2025. It is now read-only.

Commit f2551ec

Browse files
Samuel12321Samuel12321
committed
- Generated New Signing certificate
- updated .net to 9 preview - fixed crash on launch - integrated fixes from #1217 - Updated Nuget Packages
1 parent a33113d commit f2551ec

10 files changed

Lines changed: 35 additions & 29 deletions

File tree

‎ModernFlyouts.Core/Interop/NativeFlyoutHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ private bool GetAllInfos()
352352
String outerName = "";
353353
String innerClass = "";
354354
String innerName = "";
355-
if (buildNumber >= 22000)
355+
if (buildNumber >= 22620) // 22H2 changes the OSD
356356
{
357357
outerClass = "XamlExplorerHostIslandWindow";
358358
innerClass = "Windows.UI.Composition.DesktopWindowContentBridge";

‎ModernFlyouts.Core/ModernFlyouts.Core.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
4+
<TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
55
<Platforms>x86;x64;arm64</Platforms>
6-
<RuntimeIdentifiers>win10-x64;win10-x86;win10-arm64</RuntimeIdentifiers>
6+
<RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
77
<UseWPF>true</UseWPF>
88
<LangVersion>preview</LangVersion>
99
</PropertyGroup>
1010

1111
<ItemGroup>
1212
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
13-
<PackageReference Include="CommunityToolkit.Mvvm" Version="7.1.0" />
14-
<PackageReference Include="NAudio" Version="2.2.0" />
13+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
14+
<PackageReference Include="NAudio" Version="2.2.1" />
1515
<PackageReference Include="NPSMLib" Version="0.9.14" />
16-
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
17-
<PackageReference Include="System.Management" Version="7.0.2" />
16+
<PackageReference Include="System.Drawing.Common" Version="9.0.0-rc.2.24474.1" />
17+
<PackageReference Include="System.Management" Version="9.0.0-rc.2.24473.5" />
1818
</ItemGroup>
1919

2020
</Project>

‎ModernFlyouts.Package/ModernFlyouts.Package.wapproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
4242
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
4343
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
44-
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
44+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
4545
<GenerateTestArtifacts>True</GenerateTestArtifacts>
4646
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
4747
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
@@ -122,9 +122,12 @@
122122
<ProjectReference Include="..\ModernFlyoutsHost\ModernFlyoutsHost.vcxproj" />
123123
<ProjectReference Include="..\ModernFlyouts\ModernFlyouts.csproj">
124124
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
125-
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
125+
<PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
126126
</ProjectReference>
127127
</ItemGroup>
128+
<ItemGroup>
129+
<PackageReference Include="System.Management" Version="9.0.0-rc.2.24473.5" />
130+
</ItemGroup>
128131
<Target Name="FlattenPackage" BeforeTargets="_ConvertItems">
129132
<ItemGroup>
130133
<_TemporaryFilteredWapProjOutput Include="@(_FilteredNonWapProjProjectOutput)" />

‎ModernFlyouts.Package/Package.appxmanifest‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Identity
1212
Name="32669SamG.ModernFlyouts"
1313
Publisher="CN=samue"
14-
Version="0.9.8513.0" />
14+
Version="0.9.8622.0" />
1515

1616
<Properties>
1717
<DisplayName>ms-resource:Resources/PackageDisplayName</DisplayName>
@@ -78,7 +78,7 @@
7878
<Extensions>
7979
<uap5:Extension
8080
Category="windows.startupTask"
81-
Executable="ModernFlyoutsHost.exe"
81+
Executable="ModernFlyouts.exe"
8282
EntryPoint="Windows.FullTrustApplication">
8383
<uap5:StartupTask
8484
TaskId="ModernFlyoutsStartupId"

‎ModernFlyouts/ModernFlyouts.csproj‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
4+
<TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
55
<Platforms>x86;x64;arm64</Platforms>
6-
<RuntimeIdentifiers>win10-x64;win10-x86;win10-arm64</RuntimeIdentifiers>
6+
<RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
77
<UseWPF>true</UseWPF>
88
<OutputType>WinExe</OutputType>
99
<NeutralLanguage>en-US</NeutralLanguage>
@@ -24,17 +24,20 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
28-
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
27+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
28+
<!--<PackageReference Include="H.NotifyIcon.Wpf" Version="2.1.4" />-->
29+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
2930
<PackageReference Include="ModernWpf.Toolkit.UI.Controls" Version="0.1.0" />
3031
<PackageReference Include="ModernWpfUI" Version="0.9.6" />
3132
<PackageReference Include="Hardcodet.NotifyIcon.Wpf.NetCore" Version="1.0.18" />
33+
<PackageReference Include="System.Drawing.Common" Version="9.0.0-rc.2.24474.1" />
34+
<PackageReference Include="System.Management" Version="9.0.0-rc.2.24473.5" />
3235
</ItemGroup>
3336

3437
<ItemGroup Condition="'$(Configuration)' == 'Release'">
35-
<PackageReference Include="Microsoft.AppCenter" Version="4.3.0" />
36-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.3.0" />
37-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.3.0" />
38+
<PackageReference Include="Microsoft.AppCenter" Version="5.0.6" />
39+
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.6" />
40+
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
3841
<PackageReference Include="Microsoft.Services.Store.SDK" Version="10.1705.16001" />
3942
</ItemGroup>
4043

ModernFlyouts/Properties/PublishProfiles/win10-arm64.pubxml renamed to ModernFlyouts/Properties/PublishProfiles/win-arm64.pubxml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
88
<Platform>arm64</Platform>
99
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
1010
<PublishProtocol>FileSystem</PublishProtocol>
11-
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
12-
<RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
11+
<TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
12+
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
1313
<SelfContained>true</SelfContained>
1414
<PublishSingleFile>True</PublishSingleFile>
15-
<PublishReadyToRun>False</PublishReadyToRun>
15+
<PublishReadyToRun>True</PublishReadyToRun>
1616
<PublishTrimmed>False</PublishTrimmed>
1717
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
1818
</PropertyGroup>

ModernFlyouts/Properties/PublishProfiles/win10-x64.pubxml renamed to ModernFlyouts/Properties/PublishProfiles/win-x64.pubxml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
88
<Platform>x64</Platform>
99
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
1010
<PublishProtocol>FileSystem</PublishProtocol>
11-
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
12-
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
11+
<TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
12+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1313
<SelfContained>true</SelfContained>
1414
<PublishSingleFile>True</PublishSingleFile>
15-
<PublishReadyToRun>False</PublishReadyToRun>
15+
<PublishReadyToRun>True</PublishReadyToRun>
1616
<PublishTrimmed>False</PublishTrimmed>
1717
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
1818
</PropertyGroup>

ModernFlyouts/Properties/PublishProfiles/win10-x86.pubxml renamed to ModernFlyouts/Properties/PublishProfiles/win-x86.pubxml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
88
<Platform>x86</Platform>
99
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
1010
<PublishProtocol>FileSystem</PublishProtocol>
11-
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
12-
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
11+
<TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
12+
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
1313
<SelfContained>true</SelfContained>
1414
<PublishSingleFile>True</PublishSingleFile>
15-
<PublishReadyToRun>False</PublishReadyToRun>
15+
<PublishReadyToRun>True</PublishReadyToRun>
1616
<PublishTrimmed>False</PublishTrimmed>
1717
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
1818
</PropertyGroup>

‎ModernFlyoutsBridge/ModernFlyoutsBridge.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<PropertyGroup Label="Configuration">
3838
<ConfigurationType>DynamicLibrary</ConfigurationType>
3939
<UseDebugLibraries>true</UseDebugLibraries>
40-
<PlatformToolset>v142</PlatformToolset>
40+
<PlatformToolset>v143</PlatformToolset>
4141
<CharacterSet>Unicode</CharacterSet>
4242
</PropertyGroup>
4343
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎ModernFlyoutsHost/ModernFlyoutsHost.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<PropertyGroup Label="Configuration">
3838
<ConfigurationType>Application</ConfigurationType>
3939
<UseDebugLibraries>false</UseDebugLibraries>
40-
<PlatformToolset>v142</PlatformToolset>
40+
<PlatformToolset>v143</PlatformToolset>
4141
<CharacterSet>Unicode</CharacterSet>
4242
</PropertyGroup>
4343
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)