Skip to content

Commit 34e72f2

Browse files
ShomnipotenceShomnipotence
committed
集成 MicaForEveryone 并实现基于 XAML Island 的插件商店页面 (解决合并冲突)
2 parents 0713508 + 78e85ca commit 34e72f2

File tree

14 files changed

+280
-0
lines changed

14 files changed

+280
-0
lines changed

‎MicaForEveryone.Core/Ui/ViewModels/IGeneralSettingsViewModel.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
using System.ComponentModel;
3+
=======
4+
using System.ComponentModel;
5+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
26
using System.Windows.Input;
37
using CommunityToolkit.Mvvm.Input;
48

‎MicaForEveryone.Core/Ui/ViewModels/ITrayIconViewModel.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
using System.ComponentModel;
3+
=======
4+
using System.ComponentModel;
5+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
26
using System.Windows.Input;
37
using CommunityToolkit.Mvvm.Input;
48

@@ -27,7 +31,10 @@ public interface ITrayIconViewModel : INotifyPropertyChanged
2731
ICommand EditConfigCommand { get; }
2832

2933
ICommand OpenSettingsCommand { get; }
34+
<<<<<<< HEAD
3035
ICommand OpenStoreCommand { get; }
36+
=======
37+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
3138
ICommand ExitCommand { get; }
3239

3340
void Attach(ITrayIconView view);

‎MicaForEveryone.UI/App.xaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
<xaml:XamlApplication
3+
=======
4+
<xaml:XamlApplication
5+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
26
x:Class="MicaForEveryone.UI.App"
37
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
48
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -34,6 +38,7 @@
3438
<Setter Property="HorizontalAlignment" Value="Stretch" />
3539
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
3640
</Style>
41+
<<<<<<< HEAD
3742

3843
<Color x:Key="Primary">#512BD4</Color>
3944
<SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}" />
@@ -52,6 +57,8 @@
5257
<Setter Property="CornerRadius" Value="8" />
5358
<Setter Property="Foreground" Value="{StaticResource WhiteBrush}" />
5459
</Style>
60+
=======
61+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
5562
</ResourceDictionary>
5663
</Application.Resources>
5764
</xaml:XamlApplication>

‎MicaForEveryone.UI/App.xaml.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
namespace MicaForEveryone.UI
3+
=======
4+
namespace MicaForEveryone.UI
5+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
26
{
37
public sealed partial class App
48
{

‎MicaForEveryone.UI/MicaForEveryone.UI.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
<?xml version="1.0" encoding="utf-8"?>
3+
=======
4+
<?xml version="1.0" encoding="utf-8"?>
5+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
26
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
37
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
48
<PropertyGroup>
@@ -143,7 +147,11 @@
143147
<Version>6.1.3</Version>
144148
</PackageReference>
145149
<PackageReference Include="Microsoft.UI.Xaml">
150+
<<<<<<< HEAD
146151
<Version>2.8.6</Version>
152+
=======
153+
<Version>2.8.2-prerelease.220830001</Version>
154+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
147155
</PackageReference>
148156
<PackageReference Include="Win2D.uwp">
149157
<Version>1.27.1</Version>
@@ -263,11 +271,15 @@
263271
<Project>{56aa4f47-4776-49a1-9d7c-c9d8eb92a453}</Project>
264272
<Name>MicaForEveryone.Core</Name>
265273
</ProjectReference>
274+
<<<<<<< HEAD
266275
<ProjectReference Include="..\QuickLook.ControlPanel\QuickLook.ControlPanel.Uwp\QuickLook.ControlPanel.Uwp.csproj" Condition="Exists('..\QuickLook.ControlPanel\QuickLook.ControlPanel.Uwp\QuickLook.ControlPanel.Uwp.csproj')">
267276
<Project>{A8A7A6A5-A4A3-A2A1-A0A9-A8A7A6A5A4A3}</Project>
268277
<Name>QuickLook.ControlPanel.Uwp</Name>
269278
</ProjectReference>
270279
</ItemGroup>
280+
=======
281+
</ItemGroup>
282+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
271283
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
272284
<VisualStudioVersion>14.0</VisualStudioVersion>
273285
</PropertyGroup>

‎MicaForEveryone.UI/SettingsView.xaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
<UserControl x:Class="MicaForEveryone.UI.SettingsView"
3+
=======
4+
<UserControl x:Class="MicaForEveryone.UI.SettingsView"
5+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
26
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
37
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
48
xmlns:controls="using:MicaForEveryone.UI.Controls"

‎MicaForEveryone.UI/TrayIconView.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
<UserControl
3+
=======
4+
<UserControl
5+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
26
x:Class="MicaForEveryone.UI.TrayIconView"
37
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
48
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -121,6 +125,7 @@
121125

122126
<MenuFlyoutSeparator />
123127

128+
<<<<<<< HEAD
124129
<MenuFlyoutItem Text="插件商店" Command="{x:Bind ViewModel.OpenStoreCommand}">
125130
<MenuFlyoutItem.Icon>
126131
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE7BF;" />
@@ -130,6 +135,11 @@
130135
<MenuFlyoutItem x:Uid="SettingsMenuItem" Command="{x:Bind ViewModel.OpenSettingsCommand}">
131136
<MenuFlyoutItem.Icon>
132137
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE713;" />
138+
=======
139+
<MenuFlyoutItem x:Uid="SettingsMenuItem" Command="{x:Bind ViewModel.OpenSettingsCommand}">
140+
<MenuFlyoutItem.Icon>
141+
<SymbolIcon Symbol="Setting" />
142+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
133143
</MenuFlyoutItem.Icon>
134144
</MenuFlyoutItem>
135145

‎MicaForEveryone.sln‎

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12

23
Microsoft Visual Studio Solution File, Format Version 12.00
34
# Visual Studio Version 17
@@ -175,3 +176,164 @@ Global
175176
SolutionGuid = {EB70A2FE-2621-4A29-B851-60431404AD36}
176177
EndGlobalSection
177178
EndGlobal
179+
=======
180+

181+
Microsoft Visual Studio Solution File, Format Version 12.00
182+
# Visual Studio Version 17
183+
VisualStudioVersion = 17.1.32407.343
184+
MinimumVisualStudioVersion = 10.0.40219.1
185+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicaForEveryone", "MicaForEveryone\MicaForEveryone.csproj", "{E6F45EE9-EA05-4119-8790-DAADDA796548}"
186+
EndProject
187+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MicaForEveryone.UI", "MicaForEveryone.UI\MicaForEveryone.UI.csproj", "{740EA99D-B3F6-445D-A357-962A61357006}"
188+
EndProject
189+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicaForEveryone.Win32", "MicaForEveryone.Win32\MicaForEveryone.Win32.csproj", "{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}"
190+
EndProject
191+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A8704F1B-DF09-46DD-80AC-B7C6C442BE1D}"
192+
ProjectSection(SolutionItems) = preProject
193+
.gitignore = .gitignore
194+
CONTRIBUTING.md = CONTRIBUTING.md
195+
Installer.iss = Installer.iss
196+
LICENSE = LICENSE
197+
MicaForEveryone.pfx = MicaForEveryone.pfx
198+
README.md = README.md
199+
EndProjectSection
200+
EndProject
201+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{D5E7CCF7-CA52-4B9F-9D85-747B72904A42}"
202+
ProjectSection(SolutionItems) = preProject
203+
.github\dependabot.yml = .github\dependabot.yml
204+
EndProjectSection
205+
EndProject
206+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflow", "workflow", "{9EF51D86-285E-419C-AE09-14EBB7DE9EE9}"
207+
ProjectSection(SolutionItems) = preProject
208+
.github\workflows\ci.yml = .github\workflows\ci.yml
209+
.github\workflows\winget.yml = .github\workflows\winget.yml
210+
EndProjectSection
211+
EndProject
212+
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MicaForEveryone.Package", "MicaForEveryone.Package\MicaForEveryone.Package.wapproj", "{12503582-6D75-4DDE-97C7-B35BADE8D123}"
213+
EndProject
214+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{5D35A1AE-7CE4-48CF-BB91-62B22761BC24}"
215+
ProjectSection(SolutionItems) = preProject
216+
Assets\1.png = Assets\1.png
217+
Assets\2.png = Assets\2.png
218+
Assets\3.png = Assets\3.png
219+
EndProjectSection
220+
EndProject
221+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicaForEveryone.Core", "MicaForEveryone.Core\MicaForEveryone.Core.csproj", "{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}"
222+
EndProject
223+
Global
224+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
225+
Debug|Any CPU = Debug|Any CPU
226+
Debug|ARM64 = Debug|ARM64
227+
Debug|x64 = Debug|x64
228+
Debug|x86 = Debug|x86
229+
Release|Any CPU = Release|Any CPU
230+
Release|ARM64 = Release|ARM64
231+
Release|x64 = Release|x64
232+
Release|x86 = Release|x86
233+
EndGlobalSection
234+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
235+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Debug|Any CPU.ActiveCfg = Debug|x64
236+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Debug|Any CPU.Build.0 = Debug|x64
237+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Debug|ARM64.ActiveCfg = Debug|arm64
238+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Debug|ARM64.Build.0 = Debug|arm64
239+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Debug|x64.ActiveCfg = Debug|x64
240+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Debug|x64.Build.0 = Debug|x64
241+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Debug|x86.ActiveCfg = Debug|x86
242+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Debug|x86.Build.0 = Debug|x86
243+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Release|Any CPU.ActiveCfg = Release|x64
244+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Release|Any CPU.Build.0 = Release|x64
245+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Release|ARM64.ActiveCfg = Release|arm64
246+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Release|ARM64.Build.0 = Release|arm64
247+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Release|x64.ActiveCfg = Release|x64
248+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Release|x64.Build.0 = Release|x64
249+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Release|x86.ActiveCfg = Release|x86
250+
{E6F45EE9-EA05-4119-8790-DAADDA796548}.Release|x86.Build.0 = Release|x86
251+
{740EA99D-B3F6-445D-A357-962A61357006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
252+
{740EA99D-B3F6-445D-A357-962A61357006}.Debug|Any CPU.Build.0 = Debug|Any CPU
253+
{740EA99D-B3F6-445D-A357-962A61357006}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
254+
{740EA99D-B3F6-445D-A357-962A61357006}.Debug|ARM64.ActiveCfg = Debug|ARM64
255+
{740EA99D-B3F6-445D-A357-962A61357006}.Debug|ARM64.Build.0 = Debug|ARM64
256+
{740EA99D-B3F6-445D-A357-962A61357006}.Debug|x64.ActiveCfg = Debug|x64
257+
{740EA99D-B3F6-445D-A357-962A61357006}.Debug|x64.Build.0 = Debug|x64
258+
{740EA99D-B3F6-445D-A357-962A61357006}.Debug|x86.ActiveCfg = Debug|x86
259+
{740EA99D-B3F6-445D-A357-962A61357006}.Debug|x86.Build.0 = Debug|x86
260+
{740EA99D-B3F6-445D-A357-962A61357006}.Debug|x86.Deploy.0 = Debug|x86
261+
{740EA99D-B3F6-445D-A357-962A61357006}.Release|Any CPU.ActiveCfg = Release|Any CPU
262+
{740EA99D-B3F6-445D-A357-962A61357006}.Release|Any CPU.Build.0 = Release|Any CPU
263+
{740EA99D-B3F6-445D-A357-962A61357006}.Release|Any CPU.Deploy.0 = Release|Any CPU
264+
{740EA99D-B3F6-445D-A357-962A61357006}.Release|ARM64.ActiveCfg = Release|ARM64
265+
{740EA99D-B3F6-445D-A357-962A61357006}.Release|ARM64.Build.0 = Release|ARM64
266+
{740EA99D-B3F6-445D-A357-962A61357006}.Release|x64.ActiveCfg = Release|x64
267+
{740EA99D-B3F6-445D-A357-962A61357006}.Release|x64.Build.0 = Release|x64
268+
{740EA99D-B3F6-445D-A357-962A61357006}.Release|x86.ActiveCfg = Release|x86
269+
{740EA99D-B3F6-445D-A357-962A61357006}.Release|x86.Build.0 = Release|x86
270+
{740EA99D-B3F6-445D-A357-962A61357006}.Release|x86.Deploy.0 = Release|x86
271+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
272+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
273+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
274+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Debug|ARM64.Build.0 = Debug|Any CPU
275+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Debug|x64.ActiveCfg = Debug|x64
276+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Debug|x64.Build.0 = Debug|x64
277+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Debug|x86.ActiveCfg = Debug|x86
278+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Debug|x86.Build.0 = Debug|x86
279+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
280+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Release|Any CPU.Build.0 = Release|Any CPU
281+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Release|ARM64.ActiveCfg = Release|Any CPU
282+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Release|ARM64.Build.0 = Release|Any CPU
283+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Release|x64.ActiveCfg = Release|Any CPU
284+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Release|x64.Build.0 = Release|Any CPU
285+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Release|x86.ActiveCfg = Release|x86
286+
{473FCFBE-B22A-4BFC-BAA0-769E29C4FD5D}.Release|x86.Build.0 = Release|x86
287+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|Any CPU.ActiveCfg = Debug|x64
288+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|Any CPU.Build.0 = Debug|x64
289+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|Any CPU.Deploy.0 = Debug|x64
290+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|ARM64.ActiveCfg = Debug|ARM64
291+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|ARM64.Build.0 = Debug|ARM64
292+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|ARM64.Deploy.0 = Debug|ARM64
293+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|x64.ActiveCfg = Debug|x64
294+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|x64.Build.0 = Debug|x64
295+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|x64.Deploy.0 = Debug|x64
296+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|x86.ActiveCfg = Debug|x86
297+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|x86.Build.0 = Debug|x86
298+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Debug|x86.Deploy.0 = Debug|x86
299+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|Any CPU.ActiveCfg = Release|x64
300+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|Any CPU.Build.0 = Release|x64
301+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|Any CPU.Deploy.0 = Release|x64
302+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|ARM64.ActiveCfg = Release|ARM64
303+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|ARM64.Build.0 = Release|ARM64
304+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|ARM64.Deploy.0 = Release|ARM64
305+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|x64.ActiveCfg = Release|x64
306+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|x64.Build.0 = Release|x64
307+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|x64.Deploy.0 = Release|x64
308+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|x86.ActiveCfg = Release|x86
309+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|x86.Build.0 = Release|x86
310+
{12503582-6D75-4DDE-97C7-B35BADE8D123}.Release|x86.Deploy.0 = Release|x86
311+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
312+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Debug|Any CPU.Build.0 = Debug|Any CPU
313+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Debug|ARM64.ActiveCfg = Debug|Any CPU
314+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Debug|ARM64.Build.0 = Debug|Any CPU
315+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Debug|x64.ActiveCfg = Debug|Any CPU
316+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Debug|x64.Build.0 = Debug|Any CPU
317+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Debug|x86.ActiveCfg = Debug|Any CPU
318+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Debug|x86.Build.0 = Debug|Any CPU
319+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Release|Any CPU.ActiveCfg = Release|Any CPU
320+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Release|Any CPU.Build.0 = Release|Any CPU
321+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Release|ARM64.ActiveCfg = Release|Any CPU
322+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Release|ARM64.Build.0 = Release|Any CPU
323+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Release|x64.ActiveCfg = Release|Any CPU
324+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Release|x64.Build.0 = Release|Any CPU
325+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Release|x86.ActiveCfg = Release|Any CPU
326+
{56AA4F47-4776-49A1-9D7C-C9D8EB92A453}.Release|x86.Build.0 = Release|Any CPU
327+
EndGlobalSection
328+
GlobalSection(SolutionProperties) = preSolution
329+
HideSolutionNode = FALSE
330+
EndGlobalSection
331+
GlobalSection(NestedProjects) = preSolution
332+
{9EF51D86-285E-419C-AE09-14EBB7DE9EE9} = {D5E7CCF7-CA52-4B9F-9D85-747B72904A42}
333+
{5D35A1AE-7CE4-48CF-BB91-62B22761BC24} = {A8704F1B-DF09-46DD-80AC-B7C6C442BE1D}
334+
EndGlobalSection
335+
GlobalSection(ExtensibilityGlobals) = postSolution
336+
SolutionGuid = {EB70A2FE-2621-4A29-B851-60431404AD36}
337+
EndGlobalSection
338+
EndGlobal
339+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df

‎MicaForEveryone/Interfaces/IViewService.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
using System;
3+
=======
4+
using System;
5+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
26

37
using MicaForEveryone.Views;
48
using MicaForEveryone.Win32;
@@ -11,12 +15,18 @@ internal interface IViewService : IDisposable
1115
{
1216
MainWindow? MainWindow { get; }
1317
SettingsWindow? SettingsWindow { get; }
18+
<<<<<<< HEAD
1419
StoreWindow? StoreWindow { get; }
20+
=======
21+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
1522

1623
void Initialize(Application app);
1724
void Unload();
1825
void ShowSettingsWindow();
26+
<<<<<<< HEAD
1927
void ShowStoreWindow();
28+
=======
29+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
2030
void DispatcherEnqueue(Action action);
2131
}
2232
}

‎MicaForEveryone/MicaForEveryone.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
<Project Sdk="Microsoft.NET.Sdk">
3+
=======
4+
<Project Sdk="Microsoft.NET.Sdk">
5+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
26

37
<PropertyGroup>
48
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
@@ -48,7 +52,10 @@
4852
<ProjectReference Include="..\MicaForEveryone.Core\MicaForEveryone.Core.csproj" />
4953
<ProjectReference Include="..\MicaForEveryone.UI\MicaForEveryone.UI.csproj" />
5054
<ProjectReference Include="..\MicaForEveryone.Win32\MicaForEveryone.Win32.csproj" />
55+
<<<<<<< HEAD
5156
<ProjectReference Include="..\QuickLook.ControlPanel\QuickLook.ControlPanel.Uwp\QuickLook.ControlPanel.Uwp.csproj" Condition="Exists('..\QuickLook.ControlPanel\QuickLook.ControlPanel.Uwp\QuickLook.ControlPanel.Uwp.csproj')" />
57+
=======
58+
>>>>>>> 78e85cae0519d87800d5f0c856fe75ac229e74df
5259
</ItemGroup>
5360

5461
<ItemGroup>

0 commit comments

Comments
 (0)