Skip to content

Commit d4dd6f2

Browse files
committed
Resolved conflict
2 parents 41c78b8 + 47d5bcd commit d4dd6f2

4 files changed

+19
-5
lines changed

Flow.Launcher.Plugin.Anilist.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="AniListNet" Version="1.3.4" />
31-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0-preview3" />
32-
<PackageReference Include="Flow.Launcher.Plugin" Version="4.0.0" />
30+
<PackageReference Include="AniListNet" Version="1.7.0" />
31+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
32+
<PackageReference Include="Flow.Launcher.Plugin" Version="4.4.0" />
3333
</ItemGroup>
3434

3535
<ItemGroup>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
<ItemGroup>
5+
<Compile Update="Views\AnilistSettings.xaml.cs">
6+
<SubType>Code</SubType>
7+
</Compile>
8+
</ItemGroup>
9+
<ItemGroup>
10+
<Page Update="Views\AnilistSettings.xaml">
11+
<SubType>Designer</SubType>
12+
</Page>
13+
</ItemGroup>
14+
</Project>

Views/AnilistSettings.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Windows;
1+
using System.Windows;
22
using System.Windows.Controls;
33
using Flow.Launcher.Plugin.Anilist.ViewModels;
44

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ environment:
66
DOTNET_CLI_TELEMETRY_OPTOUT: 1
77

88
build_script:
9-
- ps: dotnet publish -c Release -r win-x64 --no-self-contained Flow.Launcher.Plugin.SamplePlugin/Flow.Launcher.Plugin.Anilist.csproj
9+
- ps: dotnet publish -c Release -r win-x64 --no-self-contained Flow.Launcher.Plugin.Anilist/Flow.Launcher.Plugin.Anilist.csproj
1010

1111
after_build:
1212
- ps: Compress-Archive -Path "Flow.Launcher.Plugin.Anilist\bin\Release\win-x64\publish\*" -DestinationPath "Flow.Launcher.Plugin.Anilist.zip"

0 commit comments

Comments
 (0)