Skip to content

Commit 20bd21b

Browse files
committed
Switch to my ModernWpfUI fork
1 parent b5d310d commit 20bd21b

File tree

3 files changed

+33
-1
lines changed

3 files changed

+33
-1
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "ModernWpf"]
2+
path = ModernWpf
3+
url = https://github.com/TBM13/ModernWpf.git

Flow.Launcher.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Proces
6565
EndProject
6666
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.WindowsSettings", "Plugins\Flow.Launcher.Plugin.WindowsSettings\Flow.Launcher.Plugin.WindowsSettings.csproj", "{5043CECE-E6A7-4867-9CBE-02D27D83747A}"
6767
EndProject
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernWpf", "ModernWpf\ModernWpf\ModernWpf.csproj", "{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}"
69+
EndProject
70+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernWpf.Controls", "ModernWpf\ModernWpf.Controls\ModernWpf.Controls.csproj", "{F2B2048C-2CD6-6D4D-418A-86E69E716615}"
71+
EndProject
6872
Global
6973
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7074
Debug|Any CPU = Debug|Any CPU
@@ -255,6 +259,30 @@ Global
255259
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x64.Build.0 = Release|Any CPU
256260
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x86.ActiveCfg = Release|Any CPU
257261
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x86.Build.0 = Release|Any CPU
262+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
263+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
264+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Debug|x64.ActiveCfg = Debug|Any CPU
265+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Debug|x64.Build.0 = Debug|Any CPU
266+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Debug|x86.ActiveCfg = Debug|Any CPU
267+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Debug|x86.Build.0 = Debug|Any CPU
268+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
269+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Release|Any CPU.Build.0 = Release|Any CPU
270+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Release|x64.ActiveCfg = Release|Any CPU
271+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Release|x64.Build.0 = Release|Any CPU
272+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Release|x86.ActiveCfg = Release|Any CPU
273+
{B6438E5E-D00F-AC32-68CF-EEF79434F3FB}.Release|x86.Build.0 = Release|Any CPU
274+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
275+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Debug|Any CPU.Build.0 = Debug|Any CPU
276+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Debug|x64.ActiveCfg = Debug|Any CPU
277+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Debug|x64.Build.0 = Debug|Any CPU
278+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Debug|x86.ActiveCfg = Debug|Any CPU
279+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Debug|x86.Build.0 = Debug|Any CPU
280+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Release|Any CPU.ActiveCfg = Release|Any CPU
281+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Release|Any CPU.Build.0 = Release|Any CPU
282+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Release|x64.ActiveCfg = Release|Any CPU
283+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Release|x64.Build.0 = Release|Any CPU
284+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Release|x86.ActiveCfg = Release|Any CPU
285+
{F2B2048C-2CD6-6D4D-418A-86E69E716615}.Release|x86.Build.0 = Release|Any CPU
258286
EndGlobalSection
259287
GlobalSection(SolutionProperties) = preSolution
260288
HideSolutionNode = FALSE

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
9696
<!-- ModernWpfUI v0.9.5 introduced WinRT changes that causes Notification platform unavailable error on some machines -->
9797
<!-- https://github.com/Flow-Launcher/Flow.Launcher/issues/1772#issuecomment-1502440801 -->
98-
<PackageReference Include="ModernWpfUI" Version="0.9.6" />
9998
<PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
10099
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0">
101100
<PrivateAssets>all</PrivateAssets>
@@ -106,6 +105,8 @@
106105
<ProjectReference Include="..\Flow.Launcher.Core\Flow.Launcher.Core.csproj" />
107106
<ProjectReference Include="..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
108107
<ProjectReference Include="..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
108+
<ProjectReference Include="..\ModernWpf\ModernWpf.Controls\ModernWpf.Controls.csproj" />
109+
<ProjectReference Include="..\ModernWpf\ModernWpf\ModernWpf.csproj" />
109110
</ItemGroup>
110111

111112
<ItemGroup>

0 commit comments

Comments
 (0)