Skip to content

Commit de97cdf

Browse files
author
Meyn
committed
Bump to .net8.0
1 parent 2c6c2d6 commit de97cdf

7 files changed

Lines changed: 24 additions & 26 deletions

File tree

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "Submodules/Lidarr"]
22
path = Submodules/Lidarr
33
url = https://github.com/Lidarr/Lidarr/
4-
[submodule "Submodules/SessionGenerator"]
5-
path = Submodules/SessionGenerator
6-
url = https://github.com/Mimigerna/YouTubeSessionGenerator-Compatibility-Version.git

‎Submodules/Lidarr‎

Submodule Lidarr updated 193 files

‎Submodules/SessionGenerator‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Tubifarry.sln‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ EndProject
88
Project("{911E67C6-3D85-4FCE-B560-20A9C3E3FF48}") = "Lidarr.Console", "Submodules\Lidarr\_output\net6.0\Lidarr.Console.exe", "{6EC23C64-DEF7-4A6A-918B-1A86CCB2AF03}"
99
ProjectSection(DebuggerProjectSystem) = preProject
1010
PortSupplier = 00000000-0000-0000-0000-000000000000
11-
Executable = Submodules\Lidarr\_output\net6.0\Lidarr.Console.exe
11+
Executable = Submodules\Lidarr\_output\net8.0\Lidarr.Console.exe
1212
RemoteMachine =
13-
StartingDirectory = Submodules\Lidarr\_output\net6.0
13+
StartingDirectory = Submodules\Lidarr\_output\net8.0
1414
Environment = Standard
1515
LaunchingEngine = 00000000-0000-0000-0000-000000000000
1616
UseLegacyDebugEngines = No
@@ -23,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Core", "Submodules\L
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidarr.Common", "Submodules\Lidarr\src\NzbDrone.Common\Lidarr.Common.csproj", "{E1E12DF8-D168-4259-96C9-B7A6EE58A4AF}"
2525
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YouTubeSessionGenerator", "Submodules\SessionGenerator\YouTubeSessionGenerator\YouTubeSessionGenerator.csproj", "{ACB3B39E-B672-426F-BD30-011EB3E67092}"
27-
EndProject
2826
Global
2927
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3028
Debug|Any CPU = Debug|Any CPU
@@ -45,10 +43,6 @@ Global
4543
{E1E12DF8-D168-4259-96C9-B7A6EE58A4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
4644
{E1E12DF8-D168-4259-96C9-B7A6EE58A4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
4745
{E1E12DF8-D168-4259-96C9-B7A6EE58A4AF}.Release|Any CPU.Build.0 = Release|Any CPU
48-
{ACB3B39E-B672-426F-BD30-011EB3E67092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{ACB3B39E-B672-426F-BD30-011EB3E67092}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{ACB3B39E-B672-426F-BD30-011EB3E67092}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{ACB3B39E-B672-426F-BD30-011EB3E67092}.Release|Any CPU.Build.0 = Release|Any CPU
5246
EndGlobalSection
5347
GlobalSection(SolutionProperties) = preSolution
5448
HideSolutionNode = FALSE

‎Tubifarry/Core/Replacements/FlexiblePluginService.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ public FlexiblePluginService(IHttpClient httpClient,
3434
return null;
3535
}
3636

37-
var framework = branch == null ? "net6.0" : $"net6.0-{branch}";
37+
string framework = branch == null ? PluginInfo.Framework : $"{PluginInfo.Framework}-{branch}";
3838

3939
releases = releases!.Where(release => release.Assets.Any(asset => asset.Name.EndsWith($"{framework}.zip"))).ToList();
40-
var latest = releases.OrderByDescending(x => x.PublishedAt).FirstOrDefault(x => IsSupported(x, branch));
40+
Release? latest = releases.OrderByDescending(x => x.PublishedAt).FirstOrDefault(x => IsSupported(x, branch));
4141

4242
if (latest == null)
4343
{
4444
_logger.Warn($"Plugin {name} requires newer version of Lidarr");
4545
return null;
4646
}
4747

48-
var version = Version.Parse(latest.TagName.TrimStart('v'));
49-
var asset = latest.Assets.FirstOrDefault(x => x.Name.EndsWith($"{framework}.zip"));
48+
Version version = Version.Parse(latest.TagName.TrimStart('v'));
49+
Asset? asset = latest.Assets.FirstOrDefault(x => x.Name.EndsWith($"{framework}.zip"));
5050

5151
if (asset == null)
5252
{
@@ -88,7 +88,7 @@ private static bool IsSupported(Release release, string? branch)
8888
return false;
8989
}
9090
Version version = Version.Parse(release.TagName.TrimStart('v'));
91-
string framework = branch == null ? "net6.0" : $"net6.0-{branch}";
91+
string framework = branch == null ? PluginInfo.Framework : $"{PluginInfo.Framework}-{branch}";
9292
Asset? asset = release.Assets.FirstOrDefault(x => x.Name.EndsWith($"{framework}.zip"));
9393
return asset != null;
9494
}

‎Tubifarry/ILRepack.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<InputAssemblies Include="$(OutputPath)Microsoft.Extensions.Logging.Abstractions.dll" />
1414
<InputAssemblies Include="$(OutputPath)Microsoft.Bcl.AsyncInterfaces.dll" />
1515
<InputAssemblies Include="$(OutputPath)Acornima.dll" />
16+
<InputAssemblies Include="$(OutputPath)System.Text.Json.dll" />
1617
<InputAssemblies Include="$(OutputPath)Jint.dll" />
1718
</ItemGroup>
1819

@@ -21,7 +22,7 @@
2122
Internalize="true"
2223
InputAssemblies="@(InputAssemblies)"
2324
TargetKind="Dll"
24-
LibraryPath="..\Submodules\Lidarr\_output\net6.0\;$(OutputPath)"
25+
LibraryPath="..\Submodules\Lidarr\_output\net8.0\;$(OutputPath)"
2526
OutputFile="$(OutputPath)$(AssemblyName).dll"
2627
/>
2728
</Target>

‎Tubifarry/Tubifarry.csproj‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<AssemblyName>Lidarr.Plugin.$(MSBuildProjectName)</AssemblyName>
@@ -19,14 +19,15 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="FuzzySharp" Version="2.0.2" />
22-
<PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.43">
22+
<PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.44">
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
</PackageReference>
26-
<PackageReference Include="Shard.DownloadAssistant" Version="1.1.0" />
27-
<PackageReference Include="Xabe.FFmpeg" Version="5.2.6" />
28-
<PackageReference Include="Xabe.FFmpeg.Downloader" Version="5.2.6" />
29-
<PackageReference Include="YouTubeMusicAPI" Version="3.0.0" />
26+
<PackageReference Include="Shard.DownloadAssistant" Version="1.1.1" />
27+
<PackageReference Include="Xabe.FFmpeg" Version="6.0.2" />
28+
<PackageReference Include="Xabe.FFmpeg.Downloader" Version="6.0.2" />
29+
<PackageReference Include="YouTubeMusicAPI" Version="3.0.1" />
30+
<PackageReference Include="YouTubeSessionGenerator" Version="1.0.2" />
3031
</ItemGroup>
3132

3233
<ItemGroup>
@@ -36,7 +37,13 @@
3637
<ItemGroup>
3738
<ProjectReference Include="..\Submodules\Lidarr\src\NzbDrone.Common\Lidarr.Common.csproj" />
3839
<ProjectReference Include="..\Submodules\Lidarr\src\NzbDrone.Core\Lidarr.Core.csproj" />
39-
<ProjectReference Include="..\Submodules\SessionGenerator\YouTubeSessionGenerator\YouTubeSessionGenerator.csproj" />
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
44+
<PrivateAssets>all</PrivateAssets>
45+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
46+
</PackageReference>
4047
</ItemGroup>
4148

4249
<!-- Import the Debug.targets file -->

0 commit comments

Comments
 (0)