Develop (#417)

* Bump xunit.runner.visualstudio from 2.8.1 to 2.8.2 Bumps xunit.runner.visualstudio from 2.8.1 to 2.8.2. --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump xunit from 2.8.1 to 2.9.0 Bumps xunit from 2.8.1 to 2.9.0. --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump InsaneGenius.Utilities from 3.1.53 to 3.1.66 Bumps InsaneGenius.Utilities from 3.1.53 to 3.1.66. --- updated-dependencies: - dependency-name: InsaneGenius.Utilities dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump InsaneGenius.Utilities from 3.1.66 to 3.1.68 Bumps InsaneGenius.Utilities from 3.1.66 to 3.1.68. --- updated-dependencies: - dependency-name: InsaneGenius.Utilities dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump Serilog from 4.0.0 to 4.0.1 Bumps [Serilog](https://github.com/serilog/serilog) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/serilog/serilog/releases) - [Commits](serilog/serilog@v4.0.0...v4.0.1) --- updated-dependencies: - dependency-name: Serilog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump JsonSchema.Net.Generation from 4.3.0.2 to 4.4.0 Bumps [JsonSchema.Net.Generation](https://github.com/json-everything/json-everything) from 4.3.0.2 to 4.4.0. - [Commits](https://github.com/json-everything/json-everything/commits) --- updated-dependencies: - dependency-name: JsonSchema.Net.Generation dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump InsaneGenius.Utilities from 3.1.68 to 3.1.72 Bumps [InsaneGenius.Utilities](https://github.com/ptr727/Utilities) from 3.1.68 to 3.1.72. - [Release notes](https://github.com/ptr727/Utilities/releases) - [Commits](ptr727/Utilities@3.1.68...3.1.72) --- updated-dependencies: - dependency-name: InsaneGenius.Utilities dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump JsonSchema.Net.Generation from 4.4.0 to 4.5.0 Bumps [JsonSchema.Net.Generation](https://github.com/json-everything/json-everything) from 4.4.0 to 4.5.0. - [Commits](https://github.com/json-everything/json-everything/commits) --- updated-dependencies: - dependency-name: JsonSchema.Net.Generation dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Dependabot groups * Settings --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ptr727 · Jul 26, 2024 · 3f46406 · 3f46406
1 parent 5de43ad
commit 3f46406
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 110 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -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:
+        - "*"
diff --git a/.github/workflows/BuildGitHubRelease.yml b/.github/workflows/BuildGitHubRelease.yml
@@ -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:

diff --git a/PlexCleaner.code-workspace b/PlexCleaner.code-workspace
@@ -21,14 +21,17 @@
 			"commandline",
 			"createschema",
 			"createsidecar",
+			"csdevkit",
 			"cuda",
+			"davidanson",
 			"decomb",
 			"defaultsettings",
 			"deint",
 			"deinterlace",
 			"deinterlaced",
 			"deinterlacing",
 			"devel",
+			"dotnettools",
 			"dvhe",
 			"EBML",
 			"Emby",
@@ -45,6 +48,7 @@
 			"gettoolinfo",
 			"getversioninfo",
 			"getxxxinfo",
+			"gruntfuggly",
 			"Gyan",
 			"hdmv",
 			"hwaccel",
@@ -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"
 		]

diff --git a/PlexCleaner/PlexCleaner.csproj b/PlexCleaner/PlexCleaner.csproj
@@ -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>
diff --git a/PlexCleanerTests/PlexCleanerTests.csproj b/PlexCleanerTests/PlexCleanerTests.csproj
@@ -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>
diff --git a/Sandbox/Sandbox.csproj b/Sandbox/Sandbox.csproj
@@ -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>