From f5fbeecce59f1af10c1ca5990c1127a03ac55d1e Mon Sep 17 00:00:00 2001 From: AdamL-Microsoft <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Mon, 19 Jun 2023 14:35:34 -0700 Subject: [PATCH 1/5] updated System.Security.Cryptography.Pkcs ver to 7.0.2 --- src/ApiService/ApiService/packages.lock.json | 9 +++++---- src/ApiService/IntegrationTests/packages.lock.json | 9 +++++---- src/ApiService/Tests/packages.lock.json | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/ApiService/ApiService/packages.lock.json b/src/ApiService/ApiService/packages.lock.json index 592e322ea1..92afb06641 100644 --- a/src/ApiService/ApiService/packages.lock.json +++ b/src/ApiService/ApiService/packages.lock.json @@ -1989,9 +1989,10 @@ } }, "System.Security.Cryptography.Pkcs": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "mjUbEXkR6DYRef6dnEYKdfec9otcAkibExL+1f9hmbGlWIUyaCnS3Y3oGZEet38waXmuY1ORE8vgv4sgD5nMYg==", + "type": "Direct", + "requested": "[7.0.2, )", + "resolved": "7.0.2", + "contentHash": "xhFNJOcQSWhpiVGLLBQYoxAltQSQVycMkwaX1z7I7oEdT9Wr0HzSM1yeAbfoHaERIYd5s6EpLSOLs2qMchSKlA==", "dependencies": { "System.Formats.Asn1": "7.0.0" } @@ -2052,7 +2053,7 @@ "resolved": "7.0.1", "contentHash": "MCxBCtH0GrDuvU63ZODwQHQZPchb24pUAX3MfZ6b13qg246ZD10PRdOvay8C9HBPfCXkymUNwFPEegud7ax2zg==", "dependencies": { - "System.Security.Cryptography.Pkcs": "7.0.0" + "System.Security.Cryptography.Pkcs": "7.0.2" } }, "System.Security.Permissions": { diff --git a/src/ApiService/IntegrationTests/packages.lock.json b/src/ApiService/IntegrationTests/packages.lock.json index 7258426459..f8eb3c3d65 100644 --- a/src/ApiService/IntegrationTests/packages.lock.json +++ b/src/ApiService/IntegrationTests/packages.lock.json @@ -2220,9 +2220,10 @@ } }, "System.Security.Cryptography.Pkcs": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "mjUbEXkR6DYRef6dnEYKdfec9otcAkibExL+1f9hmbGlWIUyaCnS3Y3oGZEet38waXmuY1ORE8vgv4sgD5nMYg==", + "type": "Direct", + "requested": "[7.0.2, )", + "resolved": "7.0.2", + "contentHash": "xhFNJOcQSWhpiVGLLBQYoxAltQSQVycMkwaX1z7I7oEdT9Wr0HzSM1yeAbfoHaERIYd5s6EpLSOLs2qMchSKlA==", "dependencies": { "System.Formats.Asn1": "7.0.0" } @@ -2283,7 +2284,7 @@ "resolved": "7.0.1", "contentHash": "MCxBCtH0GrDuvU63ZODwQHQZPchb24pUAX3MfZ6b13qg246ZD10PRdOvay8C9HBPfCXkymUNwFPEegud7ax2zg==", "dependencies": { - "System.Security.Cryptography.Pkcs": "7.0.0" + "System.Security.Cryptography.Pkcs": "7.0.2" } }, "System.Security.Permissions": { diff --git a/src/ApiService/Tests/packages.lock.json b/src/ApiService/Tests/packages.lock.json index c2ce7d2fa4..f27191dc71 100644 --- a/src/ApiService/Tests/packages.lock.json +++ b/src/ApiService/Tests/packages.lock.json @@ -2222,9 +2222,10 @@ } }, "System.Security.Cryptography.Pkcs": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "mjUbEXkR6DYRef6dnEYKdfec9otcAkibExL+1f9hmbGlWIUyaCnS3Y3oGZEet38waXmuY1ORE8vgv4sgD5nMYg==", + "type": "Direct", + "requested": "[7.0.2, )", + "resolved": "7.0.2", + "contentHash": "xhFNJOcQSWhpiVGLLBQYoxAltQSQVycMkwaX1z7I7oEdT9Wr0HzSM1yeAbfoHaERIYd5s6EpLSOLs2qMchSKlA==", "dependencies": { "System.Formats.Asn1": "7.0.0" } @@ -2285,7 +2286,7 @@ "resolved": "7.0.1", "contentHash": "MCxBCtH0GrDuvU63ZODwQHQZPchb24pUAX3MfZ6b13qg246ZD10PRdOvay8C9HBPfCXkymUNwFPEegud7ax2zg==", "dependencies": { - "System.Security.Cryptography.Pkcs": "7.0.0" + "System.Security.Cryptography.Pkcs": "7.0.2" } }, "System.Security.Permissions": { From a30a6bdb477bfb82752a4484ce735ab7379c4194 Mon Sep 17 00:00:00 2001 From: AdamL-Microsoft <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Mon, 19 Jun 2023 15:09:01 -0700 Subject: [PATCH 2/5] nuget pkg fixes --- src/ApiService/ApiService/packages.lock.json | 20 ++++++++--------- .../IntegrationTests/packages.lock.json | 22 ++++++++++--------- src/ApiService/Tests/packages.lock.json | 21 +++++++++--------- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/ApiService/ApiService/packages.lock.json b/src/ApiService/ApiService/packages.lock.json index 92afb06641..5bf2dde06d 100644 --- a/src/ApiService/ApiService/packages.lock.json +++ b/src/ApiService/ApiService/packages.lock.json @@ -378,6 +378,15 @@ "Microsoft.Bcl.AsyncInterfaces": "6.0.0" } }, + "System.Security.Cryptography.Pkcs": { + "type": "Direct", + "requested": "[7.0.2, )", + "resolved": "7.0.2", + "contentHash": "xhFNJOcQSWhpiVGLLBQYoxAltQSQVycMkwaX1z7I7oEdT9Wr0HzSM1yeAbfoHaERIYd5s6EpLSOLs2qMchSKlA==", + "dependencies": { + "System.Formats.Asn1": "7.0.0" + } + }, "System.Text.RegularExpressions": { "type": "Direct", "requested": "[4.3.1, )", @@ -1988,15 +1997,6 @@ "System.Formats.Asn1": "5.0.0" } }, - "System.Security.Cryptography.Pkcs": { - "type": "Direct", - "requested": "[7.0.2, )", - "resolved": "7.0.2", - "contentHash": "xhFNJOcQSWhpiVGLLBQYoxAltQSQVycMkwaX1z7I7oEdT9Wr0HzSM1yeAbfoHaERIYd5s6EpLSOLs2qMchSKlA==", - "dependencies": { - "System.Formats.Asn1": "7.0.0" - } - }, "System.Security.Cryptography.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -2053,7 +2053,7 @@ "resolved": "7.0.1", "contentHash": "MCxBCtH0GrDuvU63ZODwQHQZPchb24pUAX3MfZ6b13qg246ZD10PRdOvay8C9HBPfCXkymUNwFPEegud7ax2zg==", "dependencies": { - "System.Security.Cryptography.Pkcs": "7.0.2" + "System.Security.Cryptography.Pkcs": "7.0.0" } }, "System.Security.Permissions": { diff --git a/src/ApiService/IntegrationTests/packages.lock.json b/src/ApiService/IntegrationTests/packages.lock.json index f8eb3c3d65..5685079327 100644 --- a/src/ApiService/IntegrationTests/packages.lock.json +++ b/src/ApiService/IntegrationTests/packages.lock.json @@ -37,6 +37,15 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "System.Security.Cryptography.Pkcs": { + "type": "Direct", + "requested": "[7.0.2, )", + "resolved": "7.0.2", + "contentHash": "xhFNJOcQSWhpiVGLLBQYoxAltQSQVycMkwaX1z7I7oEdT9Wr0HzSM1yeAbfoHaERIYd5s6EpLSOLs2qMchSKlA==", + "dependencies": { + "System.Formats.Asn1": "7.0.0" + } + }, "xunit": { "type": "Direct", "requested": "[2.4.2, )", @@ -2219,15 +2228,6 @@ "System.Formats.Asn1": "5.0.0" } }, - "System.Security.Cryptography.Pkcs": { - "type": "Direct", - "requested": "[7.0.2, )", - "resolved": "7.0.2", - "contentHash": "xhFNJOcQSWhpiVGLLBQYoxAltQSQVycMkwaX1z7I7oEdT9Wr0HzSM1yeAbfoHaERIYd5s6EpLSOLs2qMchSKlA==", - "dependencies": { - "System.Formats.Asn1": "7.0.0" - } - }, "System.Security.Cryptography.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -2284,7 +2284,7 @@ "resolved": "7.0.1", "contentHash": "MCxBCtH0GrDuvU63ZODwQHQZPchb24pUAX3MfZ6b13qg246ZD10PRdOvay8C9HBPfCXkymUNwFPEegud7ax2zg==", "dependencies": { - "System.Security.Cryptography.Pkcs": "7.0.2" + "System.Security.Cryptography.Pkcs": "7.0.0" } }, "System.Security.Permissions": { @@ -2612,6 +2612,7 @@ "SmartAnalyzers.CSharpExtensions.Annotations": "[4.2.7, )", "System.IdentityModel.Tokens.Jwt": "[6.29.0, )", "System.Linq.Async": "[6.0.1, )", + "System.Security.Cryptography.Pkcs": "[7.0.2, )", "System.Text.RegularExpressions": "[4.3.1, )", "TaskTupleAwaiter": "[2.0.3, )" } @@ -2625,6 +2626,7 @@ "FsCheck.Xunit": "[2.16.4, )", "Microsoft.NET.Test.Sdk": "[17.6.2, )", "Moq": "[4.17.2, )", + "System.Security.Cryptography.Pkcs": "[7.0.2, )", "xunit": "[2.4.1, )" } } diff --git a/src/ApiService/Tests/packages.lock.json b/src/ApiService/Tests/packages.lock.json index f27191dc71..34786f0b64 100644 --- a/src/ApiService/Tests/packages.lock.json +++ b/src/ApiService/Tests/packages.lock.json @@ -56,6 +56,15 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "System.Security.Cryptography.Pkcs": { + "type": "Direct", + "requested": "[7.0.2, )", + "resolved": "7.0.2", + "contentHash": "xhFNJOcQSWhpiVGLLBQYoxAltQSQVycMkwaX1z7I7oEdT9Wr0HzSM1yeAbfoHaERIYd5s6EpLSOLs2qMchSKlA==", + "dependencies": { + "System.Formats.Asn1": "7.0.0" + } + }, "xunit": { "type": "Direct", "requested": "[2.4.1, )", @@ -2221,15 +2230,6 @@ "System.Formats.Asn1": "5.0.0" } }, - "System.Security.Cryptography.Pkcs": { - "type": "Direct", - "requested": "[7.0.2, )", - "resolved": "7.0.2", - "contentHash": "xhFNJOcQSWhpiVGLLBQYoxAltQSQVycMkwaX1z7I7oEdT9Wr0HzSM1yeAbfoHaERIYd5s6EpLSOLs2qMchSKlA==", - "dependencies": { - "System.Formats.Asn1": "7.0.0" - } - }, "System.Security.Cryptography.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -2286,7 +2286,7 @@ "resolved": "7.0.1", "contentHash": "MCxBCtH0GrDuvU63ZODwQHQZPchb24pUAX3MfZ6b13qg246ZD10PRdOvay8C9HBPfCXkymUNwFPEegud7ax2zg==", "dependencies": { - "System.Security.Cryptography.Pkcs": "7.0.2" + "System.Security.Cryptography.Pkcs": "7.0.0" } }, "System.Security.Permissions": { @@ -2614,6 +2614,7 @@ "SmartAnalyzers.CSharpExtensions.Annotations": "[4.2.7, )", "System.IdentityModel.Tokens.Jwt": "[6.29.0, )", "System.Linq.Async": "[6.0.1, )", + "System.Security.Cryptography.Pkcs": "[7.0.2, )", "System.Text.RegularExpressions": "[4.3.1, )", "TaskTupleAwaiter": "[2.0.3, )" } From f1703497b6e9e56430fbc14982a6bef84ae03124 Mon Sep 17 00:00:00 2001 From: AdamL-Microsoft <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Mon, 19 Jun 2023 15:21:58 -0700 Subject: [PATCH 3/5] +csproj --- src/ApiService/ApiService/ApiService.csproj | 1 + src/ApiService/FunctionalTests/FunctionalTests.csproj | 3 ++- src/ApiService/IntegrationTests/IntegrationTests.csproj | 1 + src/ApiService/Tests/Tests.csproj | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ApiService/ApiService/ApiService.csproj b/src/ApiService/ApiService/ApiService.csproj index 29dd01c8b4..2b0c735cdd 100644 --- a/src/ApiService/ApiService/ApiService.csproj +++ b/src/ApiService/ApiService/ApiService.csproj @@ -44,6 +44,7 @@ + diff --git a/src/ApiService/FunctionalTests/FunctionalTests.csproj b/src/ApiService/FunctionalTests/FunctionalTests.csproj index d0fad3d25b..1c0868136c 100644 --- a/src/ApiService/FunctionalTests/FunctionalTests.csproj +++ b/src/ApiService/FunctionalTests/FunctionalTests.csproj @@ -17,6 +17,7 @@ + @@ -29,4 +30,4 @@ - + \ No newline at end of file diff --git a/src/ApiService/IntegrationTests/IntegrationTests.csproj b/src/ApiService/IntegrationTests/IntegrationTests.csproj index 783508dc53..32af635eb4 100644 --- a/src/ApiService/IntegrationTests/IntegrationTests.csproj +++ b/src/ApiService/IntegrationTests/IntegrationTests.csproj @@ -8,6 +8,7 @@ + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ApiService/Tests/Tests.csproj b/src/ApiService/Tests/Tests.csproj index 0e441b9023..457660dbfd 100644 --- a/src/ApiService/Tests/Tests.csproj +++ b/src/ApiService/Tests/Tests.csproj @@ -9,6 +9,7 @@ + From 58c96ba36b52e9819e0fbfd22b972ce1110b6e34 Mon Sep 17 00:00:00 2001 From: AdamL-Microsoft <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Mon, 19 Jun 2023 15:35:23 -0700 Subject: [PATCH 4/5] add to func test packages too --- src/ApiService/FunctionalTests/packages.lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ApiService/FunctionalTests/packages.lock.json b/src/ApiService/FunctionalTests/packages.lock.json index 3376916e1a..85cbed5a59 100644 --- a/src/ApiService/FunctionalTests/packages.lock.json +++ b/src/ApiService/FunctionalTests/packages.lock.json @@ -183,6 +183,7 @@ "System.Runtime.Numerics": "4.3.0", "System.Security.Cryptography.Algorithms": "4.3.0", "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Pkcs": "7.0.2", "System.Security.Cryptography.Primitives": "4.3.0", "System.Security.Cryptography.X509Certificates": "4.3.0", "System.Text.Encoding": "4.3.0", From 8c72fd66eb2911bff049e7a46802a43ae5e8d1e7 Mon Sep 17 00:00:00 2001 From: AdamL-Microsoft <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Mon, 19 Jun 2023 15:40:01 -0700 Subject: [PATCH 5/5] updated pkg json for Functional test --- src/ApiService/FunctionalTests/packages.lock.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/ApiService/FunctionalTests/packages.lock.json b/src/ApiService/FunctionalTests/packages.lock.json index 85cbed5a59..c0c895987e 100644 --- a/src/ApiService/FunctionalTests/packages.lock.json +++ b/src/ApiService/FunctionalTests/packages.lock.json @@ -70,6 +70,15 @@ "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" } }, + "System.Security.Cryptography.Pkcs": { + "type": "Direct", + "requested": "[7.0.2, )", + "resolved": "7.0.2", + "contentHash": "xhFNJOcQSWhpiVGLLBQYoxAltQSQVycMkwaX1z7I7oEdT9Wr0HzSM1yeAbfoHaERIYd5s6EpLSOLs2qMchSKlA==", + "dependencies": { + "System.Formats.Asn1": "7.0.0" + } + }, "System.Text.RegularExpressions": { "type": "Direct", "requested": "[4.3.1, )", @@ -183,7 +192,6 @@ "System.Runtime.Numerics": "4.3.0", "System.Security.Cryptography.Algorithms": "4.3.0", "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Pkcs": "7.0.2", "System.Security.Cryptography.Primitives": "4.3.0", "System.Security.Cryptography.X509Certificates": "4.3.0", "System.Text.Encoding": "4.3.0", @@ -422,6 +430,11 @@ "System.Runtime": "4.3.0" } }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==" + }, "System.Globalization": { "type": "Transitive", "resolved": "4.3.0",