From 966cbdd845b4a788e7c9ddb5d8ce557d5d816e2e Mon Sep 17 00:00:00 2001 From: Dylan Brasseur Date: Tue, 27 Jun 2023 18:32:21 +0200 Subject: [PATCH 1/2] Updated Api to 3.9.1, updated nugets --- ...rmoniK.DevelopmentKit.Client.Common.csproj | 8 +++++-- ...oniK.DevelopmentKit.Client.Symphony.csproj | 10 +++++--- ...moniK.DevelopmentKit.Client.Unified.csproj | 8 +++++-- .../ArmoniK.DevelopmentKit.Common.csproj | 8 +++++-- .../ArmoniK.EndToEndTests.Client.csproj | 23 ++++++++++++------- .../ArmoniK.EndToEndTests.Common.csproj | 18 +++++++++------ .../ArmoniK.EndToEndTests.Worker.csproj | 5 ++++ ...rmoniK.DevelopmentKit.Worker.Common.csproj | 12 ++++++---- ...niK.DevelopmentKit.Worker.DLLWorker.csproj | 6 ++++- ...oniK.DevelopmentKit.Worker.Symphony.csproj | 6 ++++- ...moniK.DevelopmentKit.Worker.Unified.csproj | 6 ++++- 11 files changed, 79 insertions(+), 31 deletions(-) diff --git a/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj b/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj index fc800f31..08ecdbb9 100644 --- a/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj +++ b/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj @@ -8,17 +8,21 @@ - + - + + + + + diff --git a/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj b/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj index 1cefd0b3..5970ba0a 100644 --- a/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj +++ b/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj @@ -9,9 +9,9 @@ - - - + + + @@ -22,6 +22,10 @@ + + + + diff --git a/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj b/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj index 159b7ffe..679c9eb4 100644 --- a/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj +++ b/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj @@ -8,9 +8,9 @@ - + - + @@ -18,6 +18,10 @@ + + + + diff --git a/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj b/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj index 95491d70..bb1dee38 100644 --- a/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj +++ b/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj @@ -9,10 +9,14 @@ - + - + + + + + diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj index fd2752fc..a4ac8d2b 100644 --- a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj +++ b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj @@ -26,23 +26,26 @@ - + - + - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + - + @@ -63,5 +66,9 @@ + + + + diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj index c92d5ff8..2ca9cf05 100644 --- a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj +++ b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj @@ -13,18 +13,22 @@ - - - - - - - + + + + + + + + + + + diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj index 94403cad..59db4c1b 100644 --- a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj +++ b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj @@ -37,6 +37,11 @@ + + + + + diff --git a/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj b/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj index d1d15123..b7cec193 100644 --- a/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj +++ b/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj @@ -8,11 +8,11 @@ - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -23,6 +23,10 @@ + + + + diff --git a/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj b/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj index 72175929..5790865f 100644 --- a/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj +++ b/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj @@ -17,13 +17,17 @@ - + + + + + diff --git a/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj b/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj index 8f76e551..46a07665 100644 --- a/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj +++ b/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj @@ -9,13 +9,17 @@ - + + + + + diff --git a/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj b/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj index 67797892..0d95447e 100644 --- a/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj +++ b/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj @@ -12,7 +12,11 @@ - + + + + + From 82bf26bb334f07745a8ef9f02ea47dc766ec6ec4 Mon Sep 17 00:00:00 2001 From: Dylan Brasseur Date: Wed, 28 Jun 2023 14:01:44 +0200 Subject: [PATCH 2/2] Removed added net analyzer --- .../Common/ArmoniK.DevelopmentKit.Client.Common.csproj | 4 ---- .../ArmoniK.DevelopmentKit.Client.Symphony.csproj | 4 ---- .../ArmoniK.DevelopmentKit.Client.Unified.csproj | 4 ---- Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj | 4 ---- Directory.Build.props | 2 +- .../ArmoniK.EndToEndTests.Client.csproj | 4 ---- .../ArmoniK.EndToEndTests.Common.csproj | 6 +----- .../ArmoniK.EndToEndTests.Worker.csproj | 10 +++------- .../Common/ArmoniK.DevelopmentKit.Worker.Common.csproj | 6 +----- .../ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj | 4 ---- .../ArmoniK.DevelopmentKit.Worker.Symphony.csproj | 4 ---- .../ArmoniK.DevelopmentKit.Worker.Unified.csproj | 4 ---- 12 files changed, 6 insertions(+), 50 deletions(-) diff --git a/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj b/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj index 08ecdbb9..898fdfd0 100644 --- a/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj +++ b/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj @@ -19,10 +19,6 @@ - - - - diff --git a/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj b/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj index 5970ba0a..16854cd3 100644 --- a/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj +++ b/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj @@ -22,10 +22,6 @@ - - - - diff --git a/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj b/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj index 679c9eb4..83eefd00 100644 --- a/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj +++ b/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj @@ -18,10 +18,6 @@ - - - - diff --git a/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj b/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj index bb1dee38..c844fe15 100644 --- a/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj +++ b/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj @@ -15,10 +15,6 @@ - - - - diff --git a/Directory.Build.props b/Directory.Build.props index 1cb32738..0f2d527a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -71,7 +71,7 @@ - + diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj index a4ac8d2b..5bebe4d5 100644 --- a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj +++ b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Client/ArmoniK.EndToEndTests.Client.csproj @@ -66,9 +66,5 @@ - - - - diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj index 2ca9cf05..726a4ada 100644 --- a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj +++ b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj @@ -1,4 +1,4 @@ - + netstandard2.0;net6.0 @@ -26,9 +26,5 @@ - - - - diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj index 59db4c1b..3c02b4ac 100644 --- a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj +++ b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker/ArmoniK.EndToEndTests.Worker.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -37,17 +37,13 @@ - - - - - - + diff --git a/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj b/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj index b7cec193..744549b8 100644 --- a/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj +++ b/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -23,10 +23,6 @@ - - - - diff --git a/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj b/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj index 5790865f..4d710097 100644 --- a/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj +++ b/Worker/src/DLLWorker/ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj @@ -24,10 +24,6 @@ - - - - diff --git a/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj b/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj index 46a07665..76af5520 100644 --- a/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj +++ b/Worker/src/Symphony/ArmoniK.DevelopmentKit.Worker.Symphony.csproj @@ -16,10 +16,6 @@ - - - - diff --git a/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj b/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj index 0d95447e..1010f856 100644 --- a/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj +++ b/Worker/src/Unified/ArmoniK.DevelopmentKit.Worker.Unified.csproj @@ -15,10 +15,6 @@ - - - -