From 95b5b84065ec002024bda842a711c676213f89aa Mon Sep 17 00:00:00 2001 From: Cory Charlton Date: Thu, 23 May 2024 09:27:00 -0700 Subject: [PATCH 1/2] Update Microsoft.TestPlatform.ObjectModel for dependabot --- .../README-BEFORE-UPATING-REFS.txt | 18 ++++++----- .../nanoFramework.TestAdapter.csproj | 6 ++-- source/TestAdapter/packages.lock.json | 31 +++++++------------ 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/source/TestAdapter/README-BEFORE-UPATING-REFS.txt b/source/TestAdapter/README-BEFORE-UPATING-REFS.txt index 37fbbb7..258b083 100644 --- a/source/TestAdapter/README-BEFORE-UPATING-REFS.txt +++ b/source/TestAdapter/README-BEFORE-UPATING-REFS.txt @@ -1,11 +1,15 @@ -******************************************* -*** WARNING **** -*** Do NOT update CLIWrap beyond v3.6.1 *** -*** as it will break VS Test Explorer *** -******************************************* +******************************************** +*** WARNING *** +*** Do NOT update ICSharpCode.Decompiler *** +*** beyond 7.2.1.6856 as it will break *** +*** VS Test Explorer *** +******************************************** + +This happens because of a nested dependency on +System.Runtime.CompilerServices.Unsafe. -This happens because of a nested dependency on System.Runtime.CompilerServices.Unsafe. Moving beyond this version requires testing this. -Reported and it's a know issue wit vstest. See: + +Reported and it's a know issue with vstest. See: https://github.com/microsoft/vstest/issues/4673 https://github.com/microsoft/vstest/issues/4775 diff --git a/source/TestAdapter/nanoFramework.TestAdapter.csproj b/source/TestAdapter/nanoFramework.TestAdapter.csproj index 752b0eb..a5c6153 100644 --- a/source/TestAdapter/nanoFramework.TestAdapter.csproj +++ b/source/TestAdapter/nanoFramework.TestAdapter.csproj @@ -12,12 +12,12 @@ - + - + - 3.6.132 + 3.6.133 all diff --git a/source/TestAdapter/packages.lock.json b/source/TestAdapter/packages.lock.json index 1b0b4b1..08887c9 100644 --- a/source/TestAdapter/packages.lock.json +++ b/source/TestAdapter/packages.lock.json @@ -4,12 +4,11 @@ ".NETFramework,Version=v4.8": { "CliWrap": { "type": "Direct", - "requested": "[3.6.1, )", - "resolved": "3.6.1", - "contentHash": "vAZOcQBJpf3Lz1gyKnnhbRw6Fhw+/rsQqGJhoVfb5BEeTKbIgAPZ6LrzcJf6XV58CmC2L2t3oKNV8s4BE1HtPQ==", + "requested": "[3.6.6, )", + "resolved": "3.6.6", + "contentHash": "8/WnYKDjXjqMp9ktCygmeC6kDsmSEKF4riEYNy98+nD3wOKbuxqOjmhiFMalOYlM+mUqfs3SOEowF20+loDZHQ==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "7.0.0", - "System.Buffers": "4.5.1", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Memory": "4.5.5", "System.Threading.Tasks.Extensions": "4.5.4", "System.ValueTuple": "4.5.0" @@ -28,11 +27,10 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "requested": "[17.10.0, )", + "resolved": "17.10.0", + "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==", "dependencies": { - "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" } }, @@ -49,9 +47,9 @@ }, "Nerdbank.GitVersioning": { "type": "Direct", - "requested": "[3.6.132, )", - "resolved": "3.6.132", - "contentHash": "t5aTPfMt+E7qsAIWyN7xcmmLQohzS6Ax6cmDLEk4RkRIJq878PR/JG+HhvCbn5DlxRHMWLQZBjuTFypDrDjClw==" + "requested": "[3.6.133, )", + "resolved": "3.6.133", + "contentHash": "VZWMd5YAeDxpjWjAP/X6bAxnRMiEf6tES/ITN0X5CHJgkWLLeHGmEALivmTAfYM6P+P/3Szy6VCITUAkqjcHVw==" }, "Newtonsoft.Json": { "type": "Direct", @@ -66,8 +64,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "3aeMZ1N0lJoSyzqiP03hqemtb1BijhsJADdobn/4nsMJ8V1H+CrpuduUe4hlRdx+ikBQju1VGjMD1GJ3Sk05Eg==", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } @@ -81,11 +79,6 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "NuGet.Frameworks": { - "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" - }, "Polly": { "type": "Transitive", "resolved": "7.2.3", From 6319ccb5a69a8e6e3318cc0c525ab0e9e0942cab Mon Sep 17 00:00:00 2001 From: Cory Charlton Date: Thu, 23 May 2024 18:59:25 -0700 Subject: [PATCH 2/2] Revert CliWrap update --- .../TestAdapter/README-BEFORE-UPATING-REFS.txt | 18 +++++++----------- .../nanoFramework.TestAdapter.csproj | 2 +- source/TestAdapter/packages.lock.json | 13 +++++++------ 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/source/TestAdapter/README-BEFORE-UPATING-REFS.txt b/source/TestAdapter/README-BEFORE-UPATING-REFS.txt index 258b083..37fbbb7 100644 --- a/source/TestAdapter/README-BEFORE-UPATING-REFS.txt +++ b/source/TestAdapter/README-BEFORE-UPATING-REFS.txt @@ -1,15 +1,11 @@ -******************************************** -*** WARNING *** -*** Do NOT update ICSharpCode.Decompiler *** -*** beyond 7.2.1.6856 as it will break *** -*** VS Test Explorer *** -******************************************** - -This happens because of a nested dependency on -System.Runtime.CompilerServices.Unsafe. +******************************************* +*** WARNING **** +*** Do NOT update CLIWrap beyond v3.6.1 *** +*** as it will break VS Test Explorer *** +******************************************* +This happens because of a nested dependency on System.Runtime.CompilerServices.Unsafe. Moving beyond this version requires testing this. - -Reported and it's a know issue with vstest. See: +Reported and it's a know issue wit vstest. See: https://github.com/microsoft/vstest/issues/4673 https://github.com/microsoft/vstest/issues/4775 diff --git a/source/TestAdapter/nanoFramework.TestAdapter.csproj b/source/TestAdapter/nanoFramework.TestAdapter.csproj index a5c6153..9398594 100644 --- a/source/TestAdapter/nanoFramework.TestAdapter.csproj +++ b/source/TestAdapter/nanoFramework.TestAdapter.csproj @@ -12,7 +12,7 @@ - + diff --git a/source/TestAdapter/packages.lock.json b/source/TestAdapter/packages.lock.json index 08887c9..6183b69 100644 --- a/source/TestAdapter/packages.lock.json +++ b/source/TestAdapter/packages.lock.json @@ -4,11 +4,12 @@ ".NETFramework,Version=v4.8": { "CliWrap": { "type": "Direct", - "requested": "[3.6.6, )", - "resolved": "3.6.6", - "contentHash": "8/WnYKDjXjqMp9ktCygmeC6kDsmSEKF4riEYNy98+nD3wOKbuxqOjmhiFMalOYlM+mUqfs3SOEowF20+loDZHQ==", + "requested": "[3.6.1, )", + "resolved": "3.6.1", + "contentHash": "vAZOcQBJpf3Lz1gyKnnhbRw6Fhw+/rsQqGJhoVfb5BEeTKbIgAPZ6LrzcJf6XV58CmC2L2t3oKNV8s4BE1HtPQ==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", + "System.Buffers": "4.5.1", "System.Memory": "4.5.5", "System.Threading.Tasks.Extensions": "4.5.4", "System.ValueTuple": "4.5.0" @@ -64,8 +65,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "resolved": "7.0.0", + "contentHash": "3aeMZ1N0lJoSyzqiP03hqemtb1BijhsJADdobn/4nsMJ8V1H+CrpuduUe4hlRdx+ikBQju1VGjMD1GJ3Sk05Eg==", "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" }