Skip to content

Commit df54b64

Browse files
author
sam
committed
merge branch dev into main for 0.9.1
2 parents 42a30bf + a9aea8a commit df54b64

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+244
-493
lines changed

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<PropertyGroup>
33
<Authors>ModernFlyouts Community</Authors>
44
<LangVersion>latest</LangVersion>
5-
<Version>0.9</Version>
5+
<Version>0.9.1-beta.2</Version>
66
</PropertyGroup>
77
</Project>

‎ModernFlyouts.Core/ModernFlyouts.Core.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
4+
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
5+
<RuntimeIdentifiers>win10-x64;win10-x86;win10-arm64</RuntimeIdentifiers>
56
<UseWPF>true</UseWPF>
6-
<Platforms>AnyCPU;x64;x86</Platforms>
7+
<Platforms>AnyCPU;x64;x86;arm64</Platforms>
78
</PropertyGroup>
89

910
<ItemGroup>
10-
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.0.0-preview4" />
11+
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.0.0-preview5" />
1112
<PackageReference Include="NAudio" Version="2.0.0" />
1213
<PackageReference Include="NPSMLib" Version="0.9.14" />
13-
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
14-
<PackageReference Include="System.Management" Version="5.0.0" />
14+
<PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.1.21102.12" />
15+
<PackageReference Include="System.Management" Version="6.0.0-preview.1.21102.12" />
1516
</ItemGroup>
1617

1718
</Project>

‎ModernFlyouts.Internal.Playground/ModernFlyouts.Internal.Playground.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
5+
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
8-
<Platforms>AnyCPU;x64;x86</Platforms>
8+
<Platforms>AnyCPU;x64;x86;ARM64</Platforms>
99
</PropertyGroup>
1010

1111
<ItemGroup>

‎ModernFlyouts.Package/Bro_A32.exe

-77.1 KB
Binary file not shown.

‎ModernFlyouts.Package/Bro_A64.exe

-88.9 KB
Binary file not shown.

‎ModernFlyouts.Package/Bro_x64.exe

-79.7 KB
Binary file not shown.

‎ModernFlyouts.Package/Bro_x86.exe

-66.1 KB
Binary file not shown.

‎ModernFlyouts.Package/ModernFlyouts.Package.wapproj

+9-54
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@
2020
<Configuration>Release</Configuration>
2121
<Platform>x64</Platform>
2222
</ProjectConfiguration>
23-
<ProjectConfiguration Include="Debug|ARM">
24-
<Configuration>Debug</Configuration>
25-
<Platform>ARM</Platform>
26-
</ProjectConfiguration>
27-
<ProjectConfiguration Include="Release|ARM">
28-
<Configuration>Release</Configuration>
29-
<Platform>ARM</Platform>
30-
</ProjectConfiguration>
3123
<ProjectConfiguration Include="Debug|ARM64">
3224
<Configuration>Debug</Configuration>
3325
<Platform>ARM64</Platform>
@@ -36,14 +28,6 @@
3628
<Configuration>Release</Configuration>
3729
<Platform>ARM64</Platform>
3830
</ProjectConfiguration>
39-
<ProjectConfiguration Include="Debug|AnyCPU">
40-
<Configuration>Debug</Configuration>
41-
<Platform>AnyCPU</Platform>
42-
</ProjectConfiguration>
43-
<ProjectConfiguration Include="Release|AnyCPU">
44-
<Configuration>Release</Configuration>
45-
<Platform>AnyCPU</Platform>
46-
</ProjectConfiguration>
4731
</ItemGroup>
4832
<PropertyGroup>
4933
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
@@ -55,52 +39,27 @@
5539
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
5640
<DefaultLanguage>en-US</DefaultLanguage>
5741
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
58-
<EntryPointProjectUniqueName>..\ModernFlyoutsLauncher\ModernFlyoutsLauncher.vcxproj</EntryPointProjectUniqueName>
5942
<GenerateAppInstallerFile>True</GenerateAppInstallerFile>
60-
<PackageCertificateThumbprint>BC4C8DAC3E018D7B1C0AEE7B40C2DEA2F3DD2BE0</PackageCertificateThumbprint>
6143
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
62-
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
44+
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
6345
<GenerateTestArtifacts>False</GenerateTestArtifacts>
6446
<AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
6547
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
6648
<AppInstallerUri>https://github.com/ModernFlyouts-Community/ModernFlyouts/tree/main/ModernFlyouts.Package/Package.appinstaller</AppInstallerUri>
49+
<EntryPointProjectUniqueName>..\ModernFlyoutsHost\ModernFlyoutsHost.vcxproj</EntryPointProjectUniqueName>
50+
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
6751
</PropertyGroup>
68-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
69-
<AppxBundle>Always</AppxBundle>
70-
</PropertyGroup>
71-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
72-
<AppxBundle>Always</AppxBundle>
73-
</PropertyGroup>
74-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
75-
<AppxBundle>Always</AppxBundle>
76-
</PropertyGroup>
77-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
78-
<AppxBundle>Always</AppxBundle>
79-
</PropertyGroup>
80-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
81-
<AppxBundle>Always</AppxBundle>
82-
</PropertyGroup>
83-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
84-
<AppxBundle>Always</AppxBundle>
85-
</PropertyGroup>
86-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
87-
<AppxBundle>Always</AppxBundle>
88-
</PropertyGroup>
89-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
90-
<AppxBundle>Always</AppxBundle>
91-
</PropertyGroup>
92-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
93-
<AppxBundle>Always</AppxBundle>
94-
</PropertyGroup>
95-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
52+
<PropertyGroup>
9653
<AppxBundle>Always</AppxBundle>
54+
<PackageCertificateKeyFile>ModernFlyouts.Package_TemporaryKey.pfx</PackageCertificateKeyFile>
9755
</PropertyGroup>
9856
<ItemGroup>
9957
<AppxManifest Include="Package.appxmanifest">
10058
<SubType>Designer</SubType>
10159
</AppxManifest>
10260
</ItemGroup>
10361
<ItemGroup>
62+
<Content Include="hostfxr.dll" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
10463
<Content Include="Images\LargeTile.scale-100.png" />
10564
<Content Include="Images\LargeTile.scale-125.png" />
10665
<Content Include="Images\LargeTile.scale-150.png" />
@@ -152,23 +111,19 @@
152111
<Content Include="Images\Wide310x150Logo.scale-150.png" />
153112
<Content Include="Images\Wide310x150Logo.scale-200.png" />
154113
<Content Include="Images\Wide310x150Logo.scale-400.png" />
155-
<Content Include="Bro_A32.exe" Condition="'$(Platform)'=='ARM'" />
156-
<Content Include="Bro_A64.exe" Condition="'$(Platform)'=='ARM64'" />
157-
<Content Include="Bro_x64.exe" Condition="'$(Platform)'=='x64'" />
158-
<Content Include="Bro_x86.exe" Condition="'$(Platform)'=='x86'" />
159-
<Content Include="hostfxr.dll" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
114+
<None Include="ModernFlyouts.Package_TemporaryKey.pfx" />
160115
<Content Include="Package.appinstaller" />
161116
<Content Include="priconfig.default.xml" />
162117
<None Include="Package.StoreAssociation.xml" />
163118
</ItemGroup>
164119
<ItemGroup>
165-
<ProjectReference Include="..\ModernFlyoutsLauncher\ModernFlyoutsLauncher.vcxproj" />
166-
<ProjectReference Include="..\ModernFlyoutsBridge\ModernFlyoutsBridge.vcxproj" />
120+
<ProjectReference Include="..\ModernFlyoutsHost\ModernFlyoutsHost.vcxproj" />
167121
<ProjectReference Include="..\ModernFlyouts\ModernFlyouts.csproj">
168122
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
169123
<PublishProfile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Properties\PublishProfiles\FolderProfile-x64.pubxml</PublishProfile>
170124
<PublishProfile Condition="'$(Configuration)|$(Platform)'=='Release|x86'">Properties\PublishProfiles\FolderProfile-x86.pubxml</PublishProfile>
171125
</ProjectReference>
126+
<ProjectReference Include="..\ModernFlyoutsBridge\ModernFlyoutsBridge.vcxproj" />
172127
</ItemGroup>
173128
<Target Name="FlattenPackage" BeforeTargets="_ConvertItems">
174129
<ItemGroup>

‎ModernFlyouts.Package/Package.appxmanifest

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<Identity
1212
Name="32669SamG.ModernFlyouts"
13-
Publisher="CN=E3B4A0F6-E459-414C-8DFB-ABEAB07C9242"
14-
Version="0.9.0.0" />
13+
Publisher="CN=Developer"
14+
Version="0.9.19.0" />
1515

1616
<Properties>
1717
<DisplayName>ModernFlyouts (Preview)</DisplayName>
@@ -21,7 +21,7 @@
2121

2222
<Dependencies>
2323
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
24-
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
24+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
2525
</Dependencies>
2626

2727
<Resources>
@@ -59,26 +59,26 @@
5959
<Applications>
6060
<Application Id="App"
6161
Executable="$targetnametoken$.exe"
62-
EntryPoint="$targetentrypoint$">
62+
EntryPoint="Windows.FullTrustApplication">
6363
<uap:VisualElements
6464
DisplayName="ModernFlyouts (Preview)"
6565
Description="ModernFlyouts"
6666
BackgroundColor="transparent"
6767
Square150x150Logo="Images\Square150x150Logo.png"
6868
Square44x44Logo="Images\Square44x44Logo.png">
69-
<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" ShortName="ModernFlyouts">
69+
<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" ShortName="ModernFlyouts">
7070
<uap:ShowNameOnTiles>
7171
<uap:ShowOn Tile="square150x150Logo"/>
7272
<uap:ShowOn Tile="wide310x150Logo"/>
7373
<uap:ShowOn Tile="square310x310Logo"/>
7474
</uap:ShowNameOnTiles>
75-
</uap:DefaultTile >
75+
</uap:DefaultTile>
7676
<uap:SplashScreen Image="Images\SplashScreen.png" />
7777
</uap:VisualElements>
7878
<Extensions>
7979
<uap5:Extension
8080
Category="windows.startupTask"
81-
Executable="ModernFlyoutsLauncher.exe"
81+
Executable="ModernFlyoutsHost.exe"
8282
EntryPoint="Windows.FullTrustApplication">
8383
<uap5:StartupTask
8484
TaskId="ModernFlyoutsStartupId"
@@ -92,7 +92,7 @@
9292
<Capabilities>
9393
<rescap:Capability Name="runFullTrust" />
9494
<!--<rescap:Capability Name="packageManagement" />-->
95-
<!--<Capability Name="globalMediaControl" / >-->
95+
<!--<Capability Name="globalMediaControl" / >-->
9696
<Capability Name="internetClient"/>
9797
</Capabilities>
9898
</Package>

0 commit comments

Comments
 (0)