From 77e682e6f478191fdf1161d18234734ed1cb1759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Wed, 27 Nov 2024 14:57:35 +0000 Subject: [PATCH] Fix update debuger lib (#855) --- .../VisualStudio.Extension-vs2019.csproj | 6 +- .../packages.lock.json | 45 +++++++++++-- .../NanoFrameworkMoniker.imagemanifest | 2 +- .../VisualStudio.Extension-vs2022.csproj | 7 +- .../packages.lock.json | 67 ++++++++++++++----- nf-debugger | 2 +- 6 files changed, 102 insertions(+), 27 deletions(-) diff --git a/VisualStudio.Extension-2019/VisualStudio.Extension-vs2019.csproj b/VisualStudio.Extension-2019/VisualStudio.Extension-vs2019.csproj index 45a3a97c..c64971c8 100644 --- a/VisualStudio.Extension-2019/VisualStudio.Extension-vs2019.csproj +++ b/VisualStudio.Extension-2019/VisualStudio.Extension-vs2019.csproj @@ -477,7 +477,7 @@ - 3.5.0 + 3.4.1 8.2.2 @@ -537,7 +537,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + + 2.5.6 + 3.6.146 diff --git a/VisualStudio.Extension-2019/packages.lock.json b/VisualStudio.Extension-2019/packages.lock.json index ac7bd06c..f6e360bb 100644 --- a/VisualStudio.Extension-2019/packages.lock.json +++ b/VisualStudio.Extension-2019/packages.lock.json @@ -4,13 +4,12 @@ ".NETFramework,Version=v4.7.2": { "CliWrap": { "type": "Direct", - "requested": "[3.5.0, )", - "resolved": "3.5.0", - "contentHash": "JhC8xnY2uVPD8/o/wj8o+5uYQ8jiWJ9rrgTI6i5QqZco++nelZ8RgBjcLmPMJMQMvAXu39obUA/aeEEaYdQUhw==", + "requested": "[3.4.1, )", + "resolved": "3.4.1", + "contentHash": "dXgBVHXxErwlSOHullgPYWeiFFs12QBSs87xGBDc/QUfunWYDL/vv7IH7Accp/qfcwSNMyDIbfeD1PPecdKRCQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", "System.Threading.Tasks.Extensions": "4.5.4", "System.ValueTuple": "4.5.0" @@ -297,6 +296,16 @@ "resolved": "2.1.113", "contentHash": "+aFNv9Kew1rxYL7boHO1WUdLRIFeqkUW23770dxQwynUquqob56nI1c5I4E4QAaCQg6TnZm+SLEIa2USHRuoRg==" }, + "nanoFramework.Tools.Debugger.Net": { + "type": "Direct", + "requested": "[2.5.6, )", + "resolved": "2.5.6", + "contentHash": "uhicQWLMeMfxuhul5iNbSFdotIuEoiHCOVE70NMZSf1zAm0rg3GxmEL8daZoVhx/dHT9EFIxFWWRSF0xHjHfLw==", + "dependencies": { + "Polly": "7.2.4", + "System.IO.Ports": "8.0.0" + } + }, "nanoFramework.Tools.MetadataProcessor.MsBuildTask": { "type": "Direct", "requested": "[3.0.56, )", @@ -1431,6 +1440,11 @@ "System.Runtime.CompilerServices.Unsafe": "4.7.1" } }, + "Polly": { + "type": "Transitive", + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" + }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -1522,6 +1536,11 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "System.IO.Ports": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "MaiPbx2/QXZc62gm/DrajRrGPG1lU4m08GWMoWiymPYM+ba4kfACp2PbiYpqJ4QiFGhHD00zX3RoVDTucjWe9g==" + }, "System.Memory": { "type": "Transitive", "resolved": "4.5.5", @@ -1831,6 +1850,24 @@ "VSSDK.IDE.12": "[12.0.4, 13.0.0)" } }, + "csharp.assemblyinfotemplate": { + "type": "Project" + }, + "csharp.blankapplication-vs2019": { + "type": "Project" + }, + "csharp.classlibrary-vs2019": { + "type": "Project" + }, + "csharp.classtemplate": { + "type": "Project" + }, + "csharp.resourcetemplate": { + "type": "Project" + }, + "csharp.testapplication-vs2019": { + "type": "Project" + }, "nanoFramework.Tools.BuildTasks": { "type": "Project", "dependencies": { diff --git a/VisualStudio.Extension-2022/NanoFrameworkMoniker.imagemanifest b/VisualStudio.Extension-2022/NanoFrameworkMoniker.imagemanifest index 0e930b0a..8f9e4541 100644 --- a/VisualStudio.Extension-2022/NanoFrameworkMoniker.imagemanifest +++ b/VisualStudio.Extension-2022/NanoFrameworkMoniker.imagemanifest @@ -1,7 +1,7 @@  - + diff --git a/VisualStudio.Extension-2022/VisualStudio.Extension-vs2022.csproj b/VisualStudio.Extension-2022/VisualStudio.Extension-vs2022.csproj index ebe1d553..bb702fea 100644 --- a/VisualStudio.Extension-2022/VisualStudio.Extension-vs2022.csproj +++ b/VisualStudio.Extension-2022/VisualStudio.Extension-vs2022.csproj @@ -517,9 +517,6 @@ 17.12.6 - - 17.11.4 - 3.3.4 runtime; build; native; contentfiles; analyzers; buildtransitive @@ -554,7 +551,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + + 2.5.6 + 3.6.146 diff --git a/VisualStudio.Extension-2022/packages.lock.json b/VisualStudio.Extension-2022/packages.lock.json index dd655a43..507cf1fb 100644 --- a/VisualStudio.Extension-2022/packages.lock.json +++ b/VisualStudio.Extension-2022/packages.lock.json @@ -108,21 +108,6 @@ "System.Threading.Tasks.Dataflow": "8.0.0" } }, - "Microsoft.Build.Utilities.Core": { - "type": "Direct", - "requested": "[17.11.4, )", - "resolved": "17.11.4", - "contentHash": "b2CEJMgVuv5fkhaR6TXjgocIa6YQbseowRj15q3/IyH343EPr+CrxXAZs6Xp6uZDE8A3ynsLPlufFUMkjUl37A==", - "dependencies": { - "Microsoft.Build.Framework": "17.11.4", - "Microsoft.IO.Redist": "6.0.0", - "Microsoft.NET.StringTools": "17.11.4", - "System.Collections.Immutable": "8.0.0", - "System.Configuration.ConfigurationManager": "8.0.0", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "Microsoft.CodeAnalysis.BannedApiAnalyzers": { "type": "Direct", "requested": "[3.3.4, )", @@ -356,6 +341,16 @@ "resolved": "2.1.113", "contentHash": "+aFNv9Kew1rxYL7boHO1WUdLRIFeqkUW23770dxQwynUquqob56nI1c5I4E4QAaCQg6TnZm+SLEIa2USHRuoRg==" }, + "nanoFramework.Tools.Debugger.Net": { + "type": "Direct", + "requested": "[2.5.6, )", + "resolved": "2.5.6", + "contentHash": "uhicQWLMeMfxuhul5iNbSFdotIuEoiHCOVE70NMZSf1zAm0rg3GxmEL8daZoVhx/dHT9EFIxFWWRSF0xHjHfLw==", + "dependencies": { + "Polly": "7.2.4", + "System.IO.Ports": "8.0.0" + } + }, "nanoFramework.Tools.MetadataProcessor.MsBuildTask": { "type": "Direct", "requested": "[3.0.56, )", @@ -491,6 +486,20 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.Build.Utilities.Core": { + "type": "Transitive", + "resolved": "17.12.6", + "contentHash": "pU3GnHcXp8VRMGKxdJCq+tixfhFn+QwEbpqmZmc/nqFHFyuhlGwjonWZMIWcwuCv/8EHgxoOttFvna1vrN+RrA==", + "dependencies": { + "Microsoft.Build.Framework": "17.12.6", + "Microsoft.IO.Redist": "6.0.1", + "Microsoft.NET.StringTools": "17.12.6", + "System.Collections.Immutable": "8.0.0", + "System.Configuration.ConfigurationManager": "8.0.0", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "Microsoft.CSharp": { "type": "Transitive", "resolved": "4.7.0", @@ -1589,6 +1598,11 @@ "resolved": "13.0.3", "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" }, + "Polly": { + "type": "Transitive", + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" + }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -1664,6 +1678,11 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "System.IO.Ports": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "MaiPbx2/QXZc62gm/DrajRrGPG1lU4m08GWMoWiymPYM+ba4kfACp2PbiYpqJ4QiFGhHD00zX3RoVDTucjWe9g==" + }, "System.Memory": { "type": "Transitive", "resolved": "4.5.5", @@ -1863,6 +1882,24 @@ "Microsoft.VisualStudio.Interop": "17.12.40391" } }, + "csharp.assemblyinfotemplate": { + "type": "Project" + }, + "csharp.blankapplication-vs2022": { + "type": "Project" + }, + "csharp.classlibrary-vs2022": { + "type": "Project" + }, + "csharp.classtemplate": { + "type": "Project" + }, + "csharp.resourcetemplate": { + "type": "Project" + }, + "csharp.testapplication-vs2022": { + "type": "Project" + }, "nanoFramework.Tools.BuildTasks": { "type": "Project", "dependencies": { diff --git a/nf-debugger b/nf-debugger index fc048feb..1b5012bd 160000 --- a/nf-debugger +++ b/nf-debugger @@ -1 +1 @@ -Subproject commit fc048feb3223580bb0c6b630d27c82f3e918c140 +Subproject commit 1b5012bd6869e84122940d1f1d8eaf438301b419