diff options
4 files changed, 6 insertions, 24 deletions
diff --git a/.github/workflows/ci-compat.yml b/.github/workflows/ci-compat.yml index 94d54ecee..702dd29b8 100644 --- a/.github/workflows/ci-compat.yml +++ b/.github/workflows/ci-compat.yml @@ -105,7 +105,7 @@ jobs: run: | { echo 'body<<EOF' - for file in Jellyfin.Data.dll MediaBrowser.Common.dll MediaBrowser.Controller.dll MediaBrowser.Model.dll Emby.Naming.dll Jellyfin.Extensions.dll Jellyfin.MediaEncoding.Keyframes.dll Jellyfin.Database.Implementations.dll Jellyfin.CodeAnalysis.dll; do + for file in Jellyfin.Data.dll MediaBrowser.Common.dll MediaBrowser.Controller.dll MediaBrowser.Model.dll Emby.Naming.dll Jellyfin.Extensions.dll Jellyfin.MediaEncoding.Keyframes.dll Jellyfin.Database.Implementations.dll; do COMPAT_OUTPUT="$( { apicompat --left ./abi-base/${file} --right ./abi-head/${file}; } 2>&1 )" if [ "APICompat ran successfully without finding any breaking changes." != "${COMPAT_OUTPUT}" ]; then printf "\n${file}\n${COMPAT_OUTPUT}\n" diff --git a/Directory.Build.props b/Directory.Build.props index 900714171..8400f4c5e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,7 +20,7 @@ </ItemGroup> <!-- Custom Analyzers --> - <ItemGroup Condition=" '$(MSBuildProjectName)' != 'Jellyfin.CodeAnalysis' "> + <ItemGroup Condition=" '$(MSBuildProjectName)' != 'Jellyfin.CodeAnalysis' AND '$(Configuration)' == 'Debug' "> <ProjectReference Include="$(MSBuildThisFileDirectory)src/Jellyfin.CodeAnalysis/Jellyfin.CodeAnalysis.csproj" OutputItemType="Analyzer" /> </ItemGroup> diff --git a/src/Jellyfin.CodeAnalysis/Jellyfin.CodeAnalysis.csproj b/src/Jellyfin.CodeAnalysis/Jellyfin.CodeAnalysis.csproj index 8a9f85ca9..64d20e904 100644 --- a/src/Jellyfin.CodeAnalysis/Jellyfin.CodeAnalysis.csproj +++ b/src/Jellyfin.CodeAnalysis/Jellyfin.CodeAnalysis.csproj @@ -7,24 +7,6 @@ <GeneratePackageOnBuild>false</GeneratePackageOnBuild> <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules> <GenerateDocumentationFile>true</GenerateDocumentationFile> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <PublishRepositoryUrl>true</PublishRepositoryUrl> - <EmbedUntrackedSources>true</EmbedUntrackedSources> - <IncludeSymbols>true</IncludeSymbols> - <SymbolPackageFormat>snupkg</SymbolPackageFormat> - </PropertyGroup> - - <PropertyGroup Condition=" '$(Stability)'=='Unstable'"> - <!-- Include all symbols in the main nupkg until Azure Artifact Feed starts supporting ingesting NuGet symbol packages. --> - <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder> - </PropertyGroup> - - <PropertyGroup> - <Authors>Jellyfin Contributors</Authors> - <PackageId>Jellyfin.CodeAnalysis</PackageId> - <VersionPrefix>10.11.0</VersionPrefix> - <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl> - <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression> </PropertyGroup> <ItemGroup> diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250913211637_AddProperParentChildRelationBaseItemWithCascade.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250913211637_AddProperParentChildRelationBaseItemWithCascade.cs index 11c84d44c..38033d07f 100644 --- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250913211637_AddProperParentChildRelationBaseItemWithCascade.cs +++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20250913211637_AddProperParentChildRelationBaseItemWithCascade.cs @@ -15,22 +15,22 @@ DELETE FROM BaseItems WHERE ParentId IS NOT NULL AND - NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE ParentId = parent.Id); + NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE parent.Id = BaseItems.ParentId); DELETE FROM BaseItems WHERE ParentId IS NOT NULL AND - NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE ParentId = parent.Id); + NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE parent.Id = BaseItems.ParentId); DELETE FROM BaseItems WHERE ParentId IS NOT NULL AND - NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE ParentId = parent.Id); + NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE parent.Id = BaseItems.ParentId); DELETE FROM BaseItems WHERE ParentId IS NOT NULL AND - NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE ParentId = parent.Id); + NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE parent.Id = BaseItems.ParentId); """); migrationBuilder.AddForeignKey( name: "FK_BaseItems_BaseItems_ParentId", |