From 9a8df96f7c44f489330bedd3e76e895138511ea5 Mon Sep 17 00:00:00 2001 From: zc <2650838+Wack0@users.noreply.github.com> Date: Tue, 28 Mar 2023 18:38:20 +0100 Subject: [PATCH] csproj: fix dependency version collision --- LibIFPSCC/LibIFPSCC.csproj | 2 +- ifpscc/ifpscc.csproj | 8 ++++---- ifpscc/packages.config | 4 ++-- uninno/App.config | 10 +++++++++- uninno/packages.config | 4 ++-- uninno/uninno.csproj | 8 ++++---- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/LibIFPSCC/LibIFPSCC.csproj b/LibIFPSCC/LibIFPSCC.csproj index 27b436a..c9d5b53 100644 --- a/LibIFPSCC/LibIFPSCC.csproj +++ b/LibIFPSCC/LibIFPSCC.csproj @@ -5,7 +5,7 @@ - + diff --git a/ifpscc/ifpscc.csproj b/ifpscc/ifpscc.csproj index e9396ea..ac5a171 100644 --- a/ifpscc/ifpscc.csproj +++ b/ifpscc/ifpscc.csproj @@ -38,12 +38,12 @@ ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\packages\System.Collections.Immutable.7.0.0\lib\net462\System.Collections.Immutable.dll + + ..\packages\System.Collections.Immutable.6.0.0\lib\net461\System.Collections.Immutable.dll - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll diff --git a/ifpscc/packages.config b/ifpscc/packages.config index ff69c5f..f80237e 100644 --- a/ifpscc/packages.config +++ b/ifpscc/packages.config @@ -1,8 +1,8 @@  - - + + \ No newline at end of file diff --git a/uninno/App.config b/uninno/App.config index 56efbc7..7d84477 100644 --- a/uninno/App.config +++ b/uninno/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + \ No newline at end of file diff --git a/uninno/packages.config b/uninno/packages.config index 1d53852..424716a 100644 --- a/uninno/packages.config +++ b/uninno/packages.config @@ -1,7 +1,7 @@  - + - + \ No newline at end of file diff --git a/uninno/uninno.csproj b/uninno/uninno.csproj index a032596..93d9d69 100644 --- a/uninno/uninno.csproj +++ b/uninno/uninno.csproj @@ -41,15 +41,15 @@ ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll