Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #417

Merged
merged 20 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
95370f6
Bump xunit.runner.visualstudio from 2.8.1 to 2.8.2
dependabot[bot] Jul 9, 2024
20d6560
Bump xunit from 2.8.1 to 2.9.0
dependabot[bot] Jul 9, 2024
56a82b2
Bump InsaneGenius.Utilities from 3.1.53 to 3.1.66
dependabot[bot] Jul 10, 2024
b2950c5
Merge pull request #403 from ptr727/dependabot/nuget/develop/InsaneGe…
github-actions[bot] Jul 10, 2024
5d943fb
Merge pull request #398 from ptr727/dependabot/nuget/develop/xunit.ru…
ptr727 Jul 10, 2024
afa8954
Merge branch 'develop' into dependabot/nuget/develop/xunit-2.9.0
ptr727 Jul 10, 2024
78e590e
Merge pull request #399 from ptr727/dependabot/nuget/develop/xunit-2.9.0
ptr727 Jul 10, 2024
e17dda2
Bump InsaneGenius.Utilities from 3.1.66 to 3.1.68
dependabot[bot] Jul 11, 2024
a26fd37
Merge pull request #407 from ptr727/dependabot/nuget/develop/InsaneGe…
github-actions[bot] Jul 11, 2024
4589f3a
Bump Serilog from 4.0.0 to 4.0.1
dependabot[bot] Jul 25, 2024
87cf434
Merge pull request #411 from ptr727/dependabot/nuget/develop/Serilog-…
github-actions[bot] Jul 25, 2024
6a60c21
Bump JsonSchema.Net.Generation from 4.3.0.2 to 4.4.0
dependabot[bot] Jul 25, 2024
0d74a94
Merge pull request #412 from ptr727/dependabot/nuget/develop/JsonSche…
github-actions[bot] Jul 25, 2024
a58edb6
Bump InsaneGenius.Utilities from 3.1.68 to 3.1.72
dependabot[bot] Jul 26, 2024
e948156
Merge pull request #413 from ptr727/dependabot/nuget/develop/InsaneGe…
github-actions[bot] Jul 26, 2024
2abba1c
Bump JsonSchema.Net.Generation from 4.4.0 to 4.5.0
dependabot[bot] Jul 26, 2024
3c2b27a
Merge pull request #414 from ptr727/dependabot/nuget/develop/JsonSche…
github-actions[bot] Jul 26, 2024
fc054ba
Dependabot groups
ptr727 Jul 26, 2024
ef0925b
Settings
ptr727 Jul 26, 2024
13593cc
Merge branch 'main' into develop
ptr727 Jul 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,40 @@ updates:

# main
- package-ecosystem: "nuget"
directory: "/"
target-branch: "main"
directory: "/"
schedule:
interval: "daily"
groups:
nuget-deps:
patterns:
- "*"
- package-ecosystem: "github-actions"
target-branch: "main"
directory: "/"
schedule:
interval: "daily"
groups:
actions-deps:
patterns:
- "*"

# develop
- package-ecosystem: "nuget"
directory: "/"
target-branch: "develop"
directory: "/"
schedule:
interval: "daily"
groups:
nuget-deps:
patterns:
- "*"
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "develop"
directory: "/"
schedule:
interval: "daily"
groups:
actions-deps:
patterns:
- "*"
1 change: 0 additions & 1 deletion .github/workflows/BuildGitHubRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ jobs:

# https://github.com/marketplace/actions/upload-a-build-artifact
- name: Upload build artifacts
# Skip pull requests
if: ${{ github.event_name != 'pull_request' }}
uses: actions/upload-artifact@v4
with:
Expand Down
9 changes: 7 additions & 2 deletions PlexCleaner.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@
"commandline",
"createschema",
"createsidecar",
"csdevkit",
"cuda",
"davidanson",
"decomb",
"defaultsettings",
"deint",
"deinterlace",
"deinterlaced",
"deinterlacing",
"devel",
"dotnettools",
"dvhe",
"EBML",
"Emby",
Expand All @@ -45,6 +48,7 @@
"gettoolinfo",
"getversioninfo",
"getxxxinfo",
"gruntfuggly",
"Gyan",
"hdmv",
"hwaccel",
Expand Down Expand Up @@ -135,13 +139,14 @@
},
"[plaintext]": {
"files.trimTrailingWhitespace": false
}
},
"diffEditor.ignoreTrimWhitespace": false,
"editor.renderWhitespace": "boundary"
},
"extensions": {
"recommendations": [
"davidanson.vscode-markdownlint",
"gruntfuggly.todo-tree",
"ms-dotnettools.csharp",
"ms-dotnettools.csdevkit",
"streetsidesoftware.code-spell-checker"
]
Expand Down
116 changes: 58 additions & 58 deletions PlexCleaner/PlexCleaner.csproj
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ApplicationIcon>Mario.ico</ApplicationIcon>
<StartupObject>PlexCleaner.Program</StartupObject>
<AssemblyName>PlexCleaner</AssemblyName>
<RootNamespace>PlexCleaner</RootNamespace>
<Authors>Pieter Viljoen</Authors>
<Company>Pieter Viljoen</Company>
<Copyright>Pieter Viljoen</Copyright>
<Description>Utility to optimize media files for Direct Play in Plex, Emby, Jellyfin.</Description>
<PackageProjectUrl>https://github.com/ptr727/PlexCleaner</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/ptr727/PlexCleaner</RepositoryUrl>
<NeutralLanguage>en</NeutralLanguage>
<Version>1.1.1</Version>
<FileVersion>1.1.1.1</FileVersion>
<AssemblyVersion>1.1.1.0</AssemblyVersion>
<PackageId>InsaneGenius.PlexCleaner</PackageId>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<AnalysisLevel>latest</AnalysisLevel>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<PackageReadmeFile>README.md</PackageReadmeFile>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<None Include="..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="InsaneGenius.Utilities" Version="3.1.72" />
<PackageReference Include="JsonSchema.Net.Generation" Version="4.5.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Serilog" Version="4.0.1" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="PlexCleanerTests" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ApplicationIcon>Mario.ico</ApplicationIcon>
<StartupObject>PlexCleaner.Program</StartupObject>
<AssemblyName>PlexCleaner</AssemblyName>
<RootNamespace>PlexCleaner</RootNamespace>
<Authors>Pieter Viljoen</Authors>
<Company>Pieter Viljoen</Company>
<Copyright>Pieter Viljoen</Copyright>
<Description>Utility to optimize media files for Direct Play in Plex, Emby, Jellyfin.</Description>
<PackageProjectUrl>https://github.com/ptr727/PlexCleaner</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/ptr727/PlexCleaner</RepositoryUrl>
<NeutralLanguage>en</NeutralLanguage>
<Version>1.1.1</Version>
<FileVersion>1.1.1.1</FileVersion>
<AssemblyVersion>1.1.1.0</AssemblyVersion>
<PackageId>InsaneGenius.PlexCleaner</PackageId>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<AnalysisLevel>latest</AnalysisLevel>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<PackageReadmeFile>README.md</PackageReadmeFile>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<None Include="..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="InsaneGenius.Utilities" Version="3.1.72" />
<PackageReference Include="JsonSchema.Net.Generation" Version="4.5.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Serilog" Version="4.0.1" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="PlexCleanerTests" />
</ItemGroup>

</Project>
54 changes: 27 additions & 27 deletions PlexCleanerTests/PlexCleanerTests.csproj
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PlexCleaner\PlexCleaner.csproj" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\PlexCleaner\PlexCleaner.csproj" />
</ItemGroup>

</Project>
38 changes: 19 additions & 19 deletions Sandbox/Sandbox.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="JsonSchema.Net.Generation" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PlexCleanerTests\PlexCleanerTests.csproj" />
<ProjectReference Include="..\PlexCleaner\PlexCleaner.csproj" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JsonSchema.Net.Generation" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\PlexCleanerTests\PlexCleanerTests.csproj" />
<ProjectReference Include="..\PlexCleaner\PlexCleaner.csproj" />
</ItemGroup>

</Project>
Loading