Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions QuickMediaIngest.Tests/QuickMediaIngest.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<IsPackable>false</IsPackable>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageReference Include="Moq" Version="4.20.72" />
<ProjectReference Include="..\QuickMediaIngest\QuickMediaIngest.csproj" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<IsPackable>false</IsPackable>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageReference Include="Moq" Version="4.20.72" />
<ProjectReference Include="..\QuickMediaIngest\QuickMediaIngest.csproj" />
</ItemGroup>
</Project>
90 changes: 42 additions & 48 deletions QuickMediaIngest.Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"net8.0-windows7.0": {
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
"requested": "[18.7.0, )",
"resolved": "18.7.0",
"contentHash": "49xH9j4UzCh2hMohJp53g3wUTvyycECw7CtVht4gfCz5ykudB1uBcF6D0TtgJPjCtP76UPW53bQElKdCeX+dUg==",
"requested": "[18.8.1, )",
"resolved": "18.8.1",
"contentHash": "dknJL3/9Y3t4XuCBqnc0PevPxgLsUMmVhjwup/b1HNovA8zWcj3XsfIf7c6p05363DWcqL7X/YhDL9B+Zymv1w==",
"dependencies": {
"Microsoft.CodeCoverage": "18.7.0",
"Microsoft.TestPlatform.TestHost": "18.7.0"
"Microsoft.CodeCoverage": "18.8.1",
"Microsoft.TestPlatform.TestHost": "18.8.1"
}
},
"Moq": {
Expand Down Expand Up @@ -58,16 +58,16 @@
},
"Magick.NET-Q16-AnyCPU": {
"type": "Transitive",
"resolved": "14.14.0",
"contentHash": "fj6KqdjMRp58cw0oWtRS5eu+sKqn6ztpLt3UXcioL4AF0r4T9VPBTh9b24EUbhlp5pgETbagLh7/bsDbWjFnwA==",
"resolved": "14.15.0",
"contentHash": "TB1Wc2hojzOMJ4tkBcXubASgtYSjEovoFpOjnfTjJXKVtKHGaN60juR+5YWFFhch1UUENcThaRWUXOWRcoGKkQ==",
"dependencies": {
"Magick.NET.Core": "14.14.0"
"Magick.NET.Core": "14.15.0"
}
},
"Magick.NET.Core": {
"type": "Transitive",
"resolved": "14.14.0",
"contentHash": "pACR3w4QmjBkebtYvZwNk0oow8YwEAF4CLfzSrGmPcWsObL8wvt/lOXsrzK9M0cVwYES7jp+bdnHQBTeQgfoIg=="
"resolved": "14.15.0",
"contentHash": "xgD1zqb4KQ1gMQcd3eIRp8hFMHBxzW9fOpLLDR7BWN0oCwZ0i6NW7rIUiCdsEi/NuZi1UlCLWBHh3v7Y2E3LIw=="
},
"MaterialDesignColors": {
"type": "Transitive",
Expand Down Expand Up @@ -98,70 +98,69 @@
},
"Microsoft.CodeCoverage": {
"type": "Transitive",
"resolved": "18.7.0",
"contentHash": "+wFfx9s7D9wegM0RziXMj2kvYDT4qcqXXtyjiQwSZOGQ2wwcOAJQcD6eQXk02jt0MvRNawtp8TJxTrV+wD8X1g=="
"resolved": "18.8.1",
"contentHash": "Eclse/ZZjr4lmWzZFNN9h/OluhKL+SK/QbUyKUewgX139aGeyMEO/DkMPwuFs2MixvanTnz6891rF8UHDg+W4Q=="
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "NijozhERJDIaJ4k5TSMy1jOi0cSC2HfkvRD/Sl+kGSSKgVbFnF4GxgtMN/MrzHB8D1JxIrD4xSer9Blh9v3axQ==",
"resolved": "10.0.10",
"contentHash": "ANyvsgkNBRvcJh2XLgn8veGmajf+8m0AbKK+HPWdRL1yraSNVVSmQhFntLtdz/C795jxqqup+k05cs/3jZQPOA==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9"
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.10"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "g41l/30G3K4B/d/L8kjux0+30e27c8D0FVQ/PFCpbekgfDpj9mnDhieP67EqXWvl1EWNeZh2rpR4F5B/jcDOHA=="
"resolved": "10.0.10",
"contentHash": "z/2xXlFw2aLGjHyEm6E0tQ+In6VfzQzTrtArbQ2c0TQE16ZbyDCMGPvaUT9I0s8rgy9sRWlU2P9waW37qV04qA=="
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "N7Gm9SjugYjmmnhwbBKC9DFqGqjfJvh6YfOJgtwh0AW0Xpok3dIVors1ik050XmUxKAgAc7nNngDIJyFb06K2g==",
"resolved": "10.0.10",
"contentHash": "Tf6z5HsL0VDYRTfvsoNrTGHGheCwkTsZBA2FFh5ATJUbkAwug+FFNISJK2gjpUNemlAOoWllAK52HOWCjto3EQ==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "10.0.9",
"Microsoft.Extensions.Logging.Abstractions": "10.0.9",
"Microsoft.Extensions.Options": "10.0.9"
"Microsoft.Extensions.DependencyInjection": "10.0.10",
"Microsoft.Extensions.Logging.Abstractions": "10.0.10",
"Microsoft.Extensions.Options": "10.0.10"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "9S/DFt4cohlMPpzIxjG6kk0L8MuN2vDm9pbMCulxtJzzk82oJHVLBd8vuQxaPskaYQwKqmFmbannf5eoChgjYg==",
"resolved": "10.0.10",
"contentHash": "zkFxGYUvdxAvIKTyXHrmW+Sux53D4SezD9dMyZ6hrwwzPQJNuwCRy1f5W7AvYTqacEGhWF2XderRQG1OvbV8og==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
"System.Diagnostics.DiagnosticSource": "10.0.9"
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.10",
"System.Diagnostics.DiagnosticSource": "10.0.10"
}
},
"Microsoft.Extensions.Options": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "hyNdX4c2UwkRkzb9byw0H2DQkRzwBM3mzY2sCM9egwzTyg8dvQJmp5noQHGEaaCORQrNK3DD2gREBsc2DlXS4A==",
"resolved": "10.0.10",
"contentHash": "srnhnk7nE8krBiIXp71LvBmKBtraBONWSRzdjJgRv1Ko9Mp8IVNqv4vIS9hGeVteBig8aQkva9ZG+sC+o5sVcA==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
"Microsoft.Extensions.Primitives": "10.0.9"
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.10",
"Microsoft.Extensions.Primitives": "10.0.10"
}
},
"Microsoft.Extensions.Primitives": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "fmEbAUFsaIKirgLt/lYhuFRBwhcSJN31jjHgCdbQxJiWOum6EdLjkbgGuukSP9z/a+9LibaxII/kF+GwOXgC4g=="
"resolved": "10.0.10",
"contentHash": "5wu/GrYVd8mG2DVUw3vFJzF+O336TyTGg/Kmcgw9bfwYhCoFiV5lR5QeEmKecJyrW4W54nMfD3p3589E8a7czQ=="
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
"resolved": "18.7.0",
"contentHash": "6rmgU4q3/WOpOPcncI0YW0Q/QpcQtwR2TTEXDR5+4TfSimPBAk6Z/BgKLeGgp1SOun0ROVUCCafXhRLwsHaPpA==",
"resolved": "18.8.1",
"contentHash": "qLbktNB1+b1XZLNJBTzaWVVJAd6PEzD7cgD406geMb6PcFZhp3EDNa1tctWx1+mtMU6MP/6ozVvFPC9vs2a9rw==",
"dependencies": {
"System.Reflection.Metadata": "8.0.0"
}
},
"Microsoft.TestPlatform.TestHost": {
"type": "Transitive",
"resolved": "18.7.0",
"contentHash": "kYwfmebCs8992zaxEDkvG7S+YEouTeKfYVKUFEkwh1W2dIoOaevBt80XSKVXCUFEhusjOIm1sFfHBnoJgygrRA==",
"resolved": "18.8.1",
"contentHash": "FaQHPDTUOcE+SFTjssNPfrub2lT9Zyon4J2W/KLHt/efLJACb1TCeWXyOgh0D/4Q1e4n+S3E6mOKud+9nLZlEA==",
"dependencies": {
"Microsoft.TestPlatform.ObjectModel": "18.7.0",
"Newtonsoft.Json": "13.0.3"
"Microsoft.TestPlatform.ObjectModel": "18.8.1"
}
},
"Microsoft.Xaml.Behaviors.Wpf": {
Expand All @@ -179,11 +178,6 @@
"resolved": "8.18.4",
"contentHash": "k6IpFlsf6Od0A0OQP+x7hoY7fWr7lldGOudXLIsxm3JRwnkR8qwm9krJZySbTXJPHXqVgN1P3QcAAgjfWTBGjQ=="
},
"Newtonsoft.Json": {
"type": "Transitive",
"resolved": "13.0.3",
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
},
"Stub.System.Data.SQLite.Core.NetStandard": {
"type": "Transitive",
"resolved": "1.0.119",
Expand All @@ -209,8 +203,8 @@
},
"System.Diagnostics.DiagnosticSource": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "VzIU41Sb23Em98hDQc71LPwKTC72xkiG7lpCZaIkf84jBJW+ViaKPa24qqR4FPmj1N4vDWilzs6Dq5Om8aFj+Q=="
"resolved": "10.0.10",
"contentHash": "cjtKi6ERMYWp6b9UTVPcwDT29PjKDtlM3W9OwnWL5abRsI8ku42Q2wqZoLIIXJnT/XF2s2CjuK8Nl4a3mmTxQQ=="
},
"System.Diagnostics.EventLog": {
"type": "Transitive",
Expand Down Expand Up @@ -283,12 +277,12 @@
"dependencies": {
"CommunityToolkit.Mvvm": "[8.4.2, )",
"FluentFTP": "[54.2.0, )",
"Magick.NET-Q16-AnyCPU": "[14.14.0, )",
"Magick.NET-Q16-AnyCPU": "[14.15.0, )",
"MaterialDesignThemes": "[5.3.2, )",
"MetadataExtractor": "[2.9.3, )",
"Meziantou.Framework.Win32.CredentialManager": "[2.0.2, )",
"Microsoft.Extensions.DependencyInjection": "[10.0.9, )",
"Microsoft.Extensions.Logging": "[10.0.9, )",
"Microsoft.Extensions.DependencyInjection": "[10.0.10, )",
"Microsoft.Extensions.Logging": "[10.0.10, )",
"NetVips": "[3.2.0, )",
"NetVips.Native.win-x64": "[8.18.4, )",
"System.Data.SQLite.Core": "[1.0.119, )",
Expand Down
78 changes: 39 additions & 39 deletions QuickMediaIngest/QuickMediaIngest.csproj
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
<ApplicationIcon>QuickMediaIngest.ico</ApplicationIcon>
<Version>1.3.20</Version>
<NeutralLanguage>en</NeutralLanguage>
<SatelliteResourceLanguages>fr;es</SatelliteResourceLanguages>
<!-- System.Data.SQLite resolves native interop using Assembly.Location; default single-file keeps managed DLLs in-memory so Location is empty and SQLiteConnection throws ArgumentNullException in Path.Combine. Extract all bundled content on startup (see docs: single-file overview, IncludeAllContentForSelfExtract). -->
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>

<ItemGroup>
<InternalsVisibleTo Include="QuickMediaIngest.Tests" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.14.0" />
<PackageReference Include="Meziantou.Framework.Win32.CredentialManager" Version="2.0.2" />
<PackageReference Include="NetVips.Native.win-x64" Version="8.18.4" />
<Resource Include="QuickMediaIngest.ico" />
<Resource Include="Assets\AppIcon.png" />
<None Include="Assets\AppIcon.source.png" />
<PackageReference Include="MaterialDesignThemes" Version="5.3.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.9" />
<PackageReference Include="NetVips" Version="3.2.0" />
<PackageReference Include="FluentFTP" Version="54.2.0" />
<PackageReference Include="MetadataExtractor" Version="2.9.3" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
<PackageReference Include="System.Management" Version="10.0.9" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
<ApplicationIcon>QuickMediaIngest.ico</ApplicationIcon>
<Version>1.3.20</Version>
<NeutralLanguage>en</NeutralLanguage>
<SatelliteResourceLanguages>fr;es</SatelliteResourceLanguages>
<!-- System.Data.SQLite resolves native interop using Assembly.Location; default single-file keeps managed DLLs in-memory so Location is empty and SQLiteConnection throws ArgumentNullException in Path.Combine. Extract all bundled content on startup (see docs: single-file overview, IncludeAllContentForSelfExtract). -->
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>
<ItemGroup>
<InternalsVisibleTo Include="QuickMediaIngest.Tests" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.15.0" />
<PackageReference Include="Meziantou.Framework.Win32.CredentialManager" Version="2.0.2" />
<PackageReference Include="NetVips.Native.win-x64" Version="8.18.4" />
<Resource Include="QuickMediaIngest.ico" />
<Resource Include="Assets\AppIcon.png" />
<None Include="Assets\AppIcon.source.png" />
<PackageReference Include="MaterialDesignThemes" Version="5.3.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.10" />
<PackageReference Include="NetVips" Version="3.2.0" />
<PackageReference Include="FluentFTP" Version="54.2.0" />
<PackageReference Include="MetadataExtractor" Version="2.9.3" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
<PackageReference Include="System.Management" Version="10.0.10" />
</ItemGroup>
</Project>
Loading
Loading