Skip to content

Commit aac99c3

Browse files
unchihugounchihugo
authored
Merge pull request #164 from unchihugo/v2.3-preparations
Add GitHub Release build configuration and prepare for v2.3
2 parents cba6ad1 + f9f26ba commit aac99c3

5 files changed

Lines changed: 90 additions & 15 deletions

File tree

‎FluentFlyout.sln‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.11.35327.3
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.3.11222.16 d18.3
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentFlyout", "FluentFlyoutWPF\FluentFlyout.csproj", "{A3576152-7AF6-4136-992A-1B3C1091652A}"
77
EndProject
@@ -14,6 +14,11 @@ Global
1414
Debug|ARM64 = Debug|ARM64
1515
Debug|x64 = Debug|x64
1616
Debug|x86 = Debug|x86
17+
GitHub Release|Any CPU = GitHub Release|Any CPU
18+
GitHub Release|ARM = GitHub Release|ARM
19+
GitHub Release|ARM64 = GitHub Release|ARM64
20+
GitHub Release|x64 = GitHub Release|x64
21+
GitHub Release|x86 = GitHub Release|x86
1722
Release|Any CPU = Release|Any CPU
1823
Release|ARM = Release|ARM
1924
Release|ARM64 = Release|ARM64
@@ -31,6 +36,16 @@ Global
3136
{A3576152-7AF6-4136-992A-1B3C1091652A}.Debug|x64.Build.0 = Debug|x64
3237
{A3576152-7AF6-4136-992A-1B3C1091652A}.Debug|x86.ActiveCfg = Debug|Any CPU
3338
{A3576152-7AF6-4136-992A-1B3C1091652A}.Debug|x86.Build.0 = Debug|Any CPU
39+
{A3576152-7AF6-4136-992A-1B3C1091652A}.GitHub Release|Any CPU.ActiveCfg = GitHub Release|x64
40+
{A3576152-7AF6-4136-992A-1B3C1091652A}.GitHub Release|Any CPU.Build.0 = GitHub Release|x64
41+
{A3576152-7AF6-4136-992A-1B3C1091652A}.GitHub Release|ARM.ActiveCfg = GitHub Release|x64
42+
{A3576152-7AF6-4136-992A-1B3C1091652A}.GitHub Release|ARM.Build.0 = GitHub Release|x64
43+
{A3576152-7AF6-4136-992A-1B3C1091652A}.GitHub Release|ARM64.ActiveCfg = GitHub Release|x64
44+
{A3576152-7AF6-4136-992A-1B3C1091652A}.GitHub Release|ARM64.Build.0 = GitHub Release|x64
45+
{A3576152-7AF6-4136-992A-1B3C1091652A}.GitHub Release|x64.ActiveCfg = GitHub Release|x64
46+
{A3576152-7AF6-4136-992A-1B3C1091652A}.GitHub Release|x64.Build.0 = GitHub Release|x64
47+
{A3576152-7AF6-4136-992A-1B3C1091652A}.GitHub Release|x86.ActiveCfg = GitHub Release|x64
48+
{A3576152-7AF6-4136-992A-1B3C1091652A}.GitHub Release|x86.Build.0 = GitHub Release|x64
3449
{A3576152-7AF6-4136-992A-1B3C1091652A}.Release|Any CPU.ActiveCfg = Release|Any CPU
3550
{A3576152-7AF6-4136-992A-1B3C1091652A}.Release|Any CPU.Build.0 = Release|Any CPU
3651
{A3576152-7AF6-4136-992A-1B3C1091652A}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -56,6 +71,21 @@ Global
5671
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.Debug|x86.ActiveCfg = Debug|x86
5772
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.Debug|x86.Build.0 = Debug|x86
5873
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.Debug|x86.Deploy.0 = Debug|x86
74+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|Any CPU.ActiveCfg = GitHub Release|Any CPU
75+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|Any CPU.Build.0 = GitHub Release|Any CPU
76+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|Any CPU.Deploy.0 = GitHub Release|Any CPU
77+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|ARM.ActiveCfg = GitHub Release|ARM
78+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|ARM.Build.0 = GitHub Release|ARM
79+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|ARM.Deploy.0 = GitHub Release|ARM
80+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|ARM64.ActiveCfg = GitHub Release|ARM64
81+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|ARM64.Build.0 = GitHub Release|ARM64
82+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|ARM64.Deploy.0 = GitHub Release|ARM64
83+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|x64.ActiveCfg = GitHub Release|x64
84+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|x64.Build.0 = GitHub Release|x64
85+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|x64.Deploy.0 = GitHub Release|x64
86+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|x86.ActiveCfg = GitHub Release|x86
87+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|x86.Build.0 = GitHub Release|x86
88+
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.GitHub Release|x86.Deploy.0 = GitHub Release|x86
5989
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.Release|Any CPU.ActiveCfg = Release|Any CPU
6090
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.Release|Any CPU.Build.0 = Release|Any CPU
6191
{7C7CB0B2-26B9-4B8B-B5E8-30ABF5E2B331}.Release|Any CPU.Deploy.0 = Release|Any CPU

‎FluentFlyoutMSIX/FluentFlyoutMSIX.wapproj‎

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,26 @@
88
<Configuration>Debug</Configuration>
99
<Platform>x86</Platform>
1010
</ProjectConfiguration>
11+
<ProjectConfiguration Include="GitHub Release|AnyCPU">
12+
<Configuration>GitHub Release</Configuration>
13+
<Platform>AnyCPU</Platform>
14+
</ProjectConfiguration>
15+
<ProjectConfiguration Include="GitHub Release|ARM">
16+
<Configuration>GitHub Release</Configuration>
17+
<Platform>ARM</Platform>
18+
</ProjectConfiguration>
19+
<ProjectConfiguration Include="GitHub Release|ARM64">
20+
<Configuration>GitHub Release</Configuration>
21+
<Platform>ARM64</Platform>
22+
</ProjectConfiguration>
23+
<ProjectConfiguration Include="GitHub Release|x64">
24+
<Configuration>GitHub Release</Configuration>
25+
<Platform>x64</Platform>
26+
</ProjectConfiguration>
27+
<ProjectConfiguration Include="GitHub Release|x86">
28+
<Configuration>GitHub Release</Configuration>
29+
<Platform>x86</Platform>
30+
</ProjectConfiguration>
1131
<ProjectConfiguration Include="Release|x86">
1232
<Configuration>Release</Configuration>
1333
<Platform>x86</Platform>
@@ -54,8 +74,8 @@
5474
<TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
5575
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
5676
<DefaultLanguage>en-US</DefaultLanguage>
57-
<AppxBundleAutoResourcePackageQualifiers>DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
58-
<AppxDefaultResourceQualifiers>Language=EN-US;EL;ES;HE;KO;NL;PT-BR;RU;TR;VI;ZH-CN</AppxDefaultResourceQualifiers>
77+
<AppxBundleAutoResourcePackageQualifiers>DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
78+
<AppxDefaultResourceQualifiers>Language=EN-US;EL;ES;HE;KO;NL;PT-BR;RU;TR;VI;ZH-CN</AppxDefaultResourceQualifiers>
5979
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
6080
<NoWarn>$(NoWarn);NU1702</NoWarn>
6181
<EntryPointProjectUniqueName>..\FluentFlyoutWPF\FluentFlyout.csproj</EntryPointProjectUniqueName>
@@ -70,34 +90,49 @@
7090
<PackageCertificateThumbprint>3532AC4C797E73A7A7442147A806ED8035BCC681</PackageCertificateThumbprint>
7191
</PropertyGroup>
7292
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
73-
<AppxBundle>Always</AppxBundle>
93+
<AppxBundle>Never</AppxBundle>
94+
</PropertyGroup>
95+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='GitHub Release|ARM'">
96+
<AppxBundle>Never</AppxBundle>
7497
</PropertyGroup>
7598
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
76-
<AppxBundle>Always</AppxBundle>
99+
<AppxBundle>Never</AppxBundle>
77100
</PropertyGroup>
78101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
79-
<AppxBundle>Always</AppxBundle>
102+
<AppxBundle>Never</AppxBundle>
103+
</PropertyGroup>
104+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='GitHub Release|x86'">
105+
<AppxBundle>Never</AppxBundle>
80106
</PropertyGroup>
81107
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
82-
<AppxBundle>Always</AppxBundle>
108+
<AppxBundle>Never</AppxBundle>
83109
</PropertyGroup>
84110
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
85-
<AppxBundle>Always</AppxBundle>
111+
<AppxBundle>Never</AppxBundle>
112+
</PropertyGroup>
113+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='GitHub Release|x64'">
114+
<AppxBundle>Never</AppxBundle>
86115
</PropertyGroup>
87116
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
88-
<AppxBundle>Always</AppxBundle>
117+
<AppxBundle>Never</AppxBundle>
118+
</PropertyGroup>
119+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='GitHub Release|AnyCPU'">
120+
<AppxBundle>Never</AppxBundle>
89121
</PropertyGroup>
90122
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
91-
<AppxBundle>Always</AppxBundle>
123+
<AppxBundle>Never</AppxBundle>
124+
</PropertyGroup>
125+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='GitHub Release|ARM64'">
126+
<AppxBundle>Never</AppxBundle>
92127
</PropertyGroup>
93128
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
94-
<AppxBundle>Always</AppxBundle>
129+
<AppxBundle>Never</AppxBundle>
95130
</PropertyGroup>
96131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
97-
<AppxBundle>Always</AppxBundle>
132+
<AppxBundle>Never</AppxBundle>
98133
</PropertyGroup>
99134
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
100-
<AppxBundle>Always</AppxBundle>
135+
<AppxBundle>Never</AppxBundle>
101136
</PropertyGroup>
102137
<ItemGroup>
103138
<AppxManifest Include="Package.appxmanifest">

‎FluentFlyoutMSIX/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Identity
1111
Name="unchihugo.FluentFlyout"
1212
Publisher="CN=49793F74-1457-4B66-A672-4ED3A640FC76"
13-
Version="2.1.0.0" />
13+
Version="2.3.0.0" />
1414

1515
<Properties>
1616
<DisplayName>FluentFlyout</DisplayName>

‎FluentFlyoutWPF/Classes/LicenseManager.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ public async Task InitializeAsync()
6969

7070
try
7171
{
72+
#if GITHUB_RELEASE
73+
_isStoreVersion = false;
74+
_isPremiumUnlocked = true;
75+
_isInitialized = true;
76+
return;
77+
#endif
7278
// Get Store context
7379
_storeContext = StoreContext.GetDefault();
7480

‎FluentFlyoutWPF/FluentFlyout.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<Platforms>x64</Platforms>
1414
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1515
<LangVersion>preview</LangVersion>
16+
<Configurations>Debug;Release;GitHub Release</Configurations>
17+
</PropertyGroup>
18+
<PropertyGroup Condition="'$(Configuration)' == 'GitHub Release'">
19+
<DefineConstants>GITHUB_RELEASE</DefineConstants>
1620
</PropertyGroup>
1721
<ItemGroup>
1822
<Content Remove="C:\Users\hu8go\.nuget\packages\dubya.windowsmediacontroller\2.5.5\contentFiles\any\net6.0-windows10.0.22000\Icon.ico" />

0 commit comments

Comments
 (0)