From d4a7150acd62f5b9893b64af2e5df5c7988991ce Mon Sep 17 00:00:00 2001 From: Wali Bhuiyan Date: Thu, 13 Jul 2023 23:00:52 -0400 Subject: [PATCH 1/4] system.private.uri vulnerability testing --- tests/Oryx.Tests.Common/Oryx.Tests.Common.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Oryx.Tests.Common/Oryx.Tests.Common.csproj b/tests/Oryx.Tests.Common/Oryx.Tests.Common.csproj index 0138faa872..55d1ff0321 100644 --- a/tests/Oryx.Tests.Common/Oryx.Tests.Common.csproj +++ b/tests/Oryx.Tests.Common/Oryx.Tests.Common.csproj @@ -11,6 +11,7 @@ + From c7e329ad52937db344383c9c7d7534f8bd4b0ec1 Mon Sep 17 00:00:00 2001 From: Wali Bhuiyan Date: Mon, 17 Jul 2023 11:49:49 -0400 Subject: [PATCH 2/4] update the version of System.Private.Uri to 4.3.2 --- src/BuildServer/BuildServer.csproj | 2 ++ src/Detector/Detector.csproj | 2 ++ src/Oryx.Common/Common.csproj | 2 ++ tests/Detector.Tests/Detector.Tests.csproj | 2 ++ tests/Oryx.Tests.Common/Oryx.Tests.Common.csproj | 1 - 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/BuildServer/BuildServer.csproj b/src/BuildServer/BuildServer.csproj index a92f6cf9d2..798fe56fa9 100644 --- a/src/BuildServer/BuildServer.csproj +++ b/src/BuildServer/BuildServer.csproj @@ -18,7 +18,9 @@ + + diff --git a/src/Detector/Detector.csproj b/src/Detector/Detector.csproj index bc7a2fa78e..3b76b88c95 100644 --- a/src/Detector/Detector.csproj +++ b/src/Detector/Detector.csproj @@ -57,7 +57,9 @@ + + diff --git a/src/Oryx.Common/Common.csproj b/src/Oryx.Common/Common.csproj index 6d8e86b567..79920c11a0 100644 --- a/src/Oryx.Common/Common.csproj +++ b/src/Oryx.Common/Common.csproj @@ -19,6 +19,8 @@ + + diff --git a/tests/Detector.Tests/Detector.Tests.csproj b/tests/Detector.Tests/Detector.Tests.csproj index ae66c3bb9f..446bafaa2a 100644 --- a/tests/Detector.Tests/Detector.Tests.csproj +++ b/tests/Detector.Tests/Detector.Tests.csproj @@ -23,6 +23,8 @@ + + all diff --git a/tests/Oryx.Tests.Common/Oryx.Tests.Common.csproj b/tests/Oryx.Tests.Common/Oryx.Tests.Common.csproj index 55d1ff0321..0138faa872 100644 --- a/tests/Oryx.Tests.Common/Oryx.Tests.Common.csproj +++ b/tests/Oryx.Tests.Common/Oryx.Tests.Common.csproj @@ -11,7 +11,6 @@ - From 7a14a520641bcf3c2c23a9df571d798a029e1146 Mon Sep 17 00:00:00 2001 From: Wali Bhuiyan Date: Tue, 18 Jul 2023 14:22:27 -0400 Subject: [PATCH 3/4] only keeping the System.Private.Uri dependency in the Common project --- src/BuildServer/BuildServer.csproj | 2 -- src/Detector/Detector.csproj | 2 -- src/Oryx.Common/Common.csproj | 1 - tests/Detector.Tests/Detector.Tests.csproj | 2 -- 4 files changed, 7 deletions(-) diff --git a/src/BuildServer/BuildServer.csproj b/src/BuildServer/BuildServer.csproj index 798fe56fa9..a92f6cf9d2 100644 --- a/src/BuildServer/BuildServer.csproj +++ b/src/BuildServer/BuildServer.csproj @@ -18,9 +18,7 @@ - - diff --git a/src/Detector/Detector.csproj b/src/Detector/Detector.csproj index 3b76b88c95..bc7a2fa78e 100644 --- a/src/Detector/Detector.csproj +++ b/src/Detector/Detector.csproj @@ -57,9 +57,7 @@ - - diff --git a/src/Oryx.Common/Common.csproj b/src/Oryx.Common/Common.csproj index 79920c11a0..d4d3fc4ff6 100644 --- a/src/Oryx.Common/Common.csproj +++ b/src/Oryx.Common/Common.csproj @@ -19,7 +19,6 @@ - diff --git a/tests/Detector.Tests/Detector.Tests.csproj b/tests/Detector.Tests/Detector.Tests.csproj index 446bafaa2a..ae66c3bb9f 100644 --- a/tests/Detector.Tests/Detector.Tests.csproj +++ b/tests/Detector.Tests/Detector.Tests.csproj @@ -23,8 +23,6 @@ - - all From a70370d0c70cce105b225ceafe28c5c612ecbab8 Mon Sep 17 00:00:00 2001 From: Wali Bhuiyan Date: Tue, 25 Jul 2023 11:16:23 -0400 Subject: [PATCH 4/4] addressed PR comment --- src/Detector/Detector.csproj | 1 + src/Oryx.Common/Common.csproj | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Detector/Detector.csproj b/src/Detector/Detector.csproj index bc7a2fa78e..2aa378ceca 100644 --- a/src/Detector/Detector.csproj +++ b/src/Detector/Detector.csproj @@ -58,6 +58,7 @@ + diff --git a/src/Oryx.Common/Common.csproj b/src/Oryx.Common/Common.csproj index d4d3fc4ff6..6d8e86b567 100644 --- a/src/Oryx.Common/Common.csproj +++ b/src/Oryx.Common/Common.csproj @@ -19,7 +19,6 @@ -