Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into Stefan1200-de-patch-TicTacToe

Browse Source
This commit is contained in:
Stefan authored and GitHub committed 2022-09-14 09:47:50 +02:00
2 parents 186067d067 f00e1d73b7
commit 1fffb034d2
2 files changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Vocaluxe.csproj
+2 -3
View File
@@ -160,9 +160,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.13.0.2-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
Vocaluxe/packages.config
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net471" /> <package id="Newtonsoft.Json" version="13.0.2-beta1" targetFramework="net471" />
<package id="vocaluxe.dependencies.acinerella" version="1.0.6" targetFramework="net40" /> <package id="vocaluxe.dependencies.acinerella" version="1.0.6" targetFramework="net40" />
<package id="vocaluxe.dependencies.aforgevideo" version="1.0.1" targetFramework="net40" /> <package id="vocaluxe.dependencies.aforgevideo" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.csharpsqlite" version="1.0.1" targetFramework="net40" /> <package id="vocaluxe.dependencies.csharpsqlite" version="1.0.1" targetFramework="net40" />