Fix update debuger lib (#855)

nanoframework · Nov 27, 2024 · 77e682e · 77e682e
1 parent 38d5b54
commit 77e682e
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 27 deletions.
diff --git a/VisualStudio.Extension-2019/VisualStudio.Extension-vs2019.csproj b/VisualStudio.Extension-2019/VisualStudio.Extension-vs2019.csproj
@@ -477,7 +477,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CliWrap">
-      <Version>3.5.0</Version>
+      <Version>3.4.1</Version>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Mvvm">
       <Version>8.2.2</Version>
@@ -537,7 +537,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="nanoFramework.Tools.Debugger.Net" Version="2.5.4" />
+    <PackageReference Include="nanoFramework.Tools.Debugger.Net">
+      <Version>2.5.6</Version>
+    </PackageReference>
     <PackageReference Include="nanoFramework.Tools.MetadataProcessor.MsBuildTask" Version="3.0.56" />
     <PackageReference Include="Nerdbank.GitVersioning">
       <Version>3.6.146</Version>

diff --git 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/VisualStudio/ImageManifestSchema/2014">
   <Symbols>
-    <String Name="Resources" Value="/nanoFramework.Tools.VS2022.Extension;v2022.12.1.3;Component/Resources" />
+    <String Name="Resources" Value="/nanoFramework.Tools.VS2022.Extension;v2022.12.1.8;Component/Resources" />
     <Guid Name="NanoFrameworkCatalog" Value="{23cf437f-5e0e-4b0c-8aa4-ceec5b5f8679}" />
     <ID Name="DeviceConnected" Value="20" />
     <ID Name="DeviceDisconnected" Value="30" />

diff --git a/VisualStudio.Extension-2022/VisualStudio.Extension-vs2022.csproj b/VisualStudio.Extension-2022/VisualStudio.Extension-vs2022.csproj
@@ -517,9 +517,6 @@
     <PackageReference Include="Microsoft.Build.Tasks.Core">
       <Version>17.12.6</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Build.Utilities.Core">
-      <Version>17.11.4</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers">
       <Version>3.3.4</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -554,7 +551,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="nanoFramework.Tools.Debugger.Net" Version="2.5.4" />
+    <PackageReference Include="nanoFramework.Tools.Debugger.Net">
+      <Version>2.5.6</Version>
+    </PackageReference>
     <PackageReference Include="nanoFramework.Tools.MetadataProcessor.MsBuildTask" Version="3.0.56" />
     <PackageReference Include="Nerdbank.GitVersioning">
       <Version>3.6.146</Version>

diff --git 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
+73 −0		.github/workflows/scorecard.yml
+3 −2		README-BEFORE-UPDATE-REFS.txt
+3 −8		USB Test App WPF/App.xaml.cs
+1 −1		USB Test App WPF/Serial Test App WPF.csproj
+4 −0		nanoFramework.Tools.DebugLibrary.Net/FodyWeavers.xml
+74 −0		nanoFramework.Tools.DebugLibrary.Net/FodyWeavers.xsd
+18 −5		nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.csproj
+2 −14		...amework.Tools.DebugLibrary.Shared/DeviceConfiguration/DeviceConfiguration.NetworkConfigurationProperties.cs
+2 −14		...k.Tools.DebugLibrary.Shared/DeviceConfiguration/DeviceConfiguration.Wireless80211ConfigurationProperties.cs
+2 −14		...work.Tools.DebugLibrary.Shared/DeviceConfiguration/DeviceConfiguration.WirelessAPConfigurationProperties.cs
+2 −14		nanoFramework.Tools.DebugLibrary.Shared/DeviceConfiguration/DeviceConfiguration.X509CaRootBundleProperties.cs
+2 −14		...ework.Tools.DebugLibrary.Shared/DeviceConfiguration/DeviceConfiguration.X509DeviceCertificatesProperties.cs
+2 −0		nanoFramework.Tools.DebugLibrary.Shared/DeviceConfiguration/DeviceConfiguration.cs
+18 −107		nanoFramework.Tools.DebugLibrary.Shared/DeviceConfiguration/NetworkConfigurationPropertiesBase.cs
+1 −1		nanoFramework.Tools.DebugLibrary.Shared/DeviceConfiguration/Wireless80211ConfigurationPropertiesBase.cs
+3 −14		nanoFramework.Tools.DebugLibrary.Shared/DeviceConfiguration/WirelessAPConfigurationPropertiesBase.cs
+10 −45		nanoFramework.Tools.DebugLibrary.Shared/DeviceConfiguration/WirelessConfigurationPropertiesBase.cs
+6 −12		nanoFramework.Tools.DebugLibrary.Shared/DeviceConfiguration/X509CaRootBundlePropertiesBase.cs
+6 −12		nanoFramework.Tools.DebugLibrary.Shared/DeviceConfiguration/X509DeviceCertificatesPropertiesBase.cs
+3 −13		nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoDevice.cs
+13 −57		nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoDeviceBase.cs