Nuget fix

nokotan · Jul 17, 2024 · db6047a · db6047a
1 parent 404b753
commit db6047a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/Emscripten.BuildSystem.vs2017/source.extension.vsixmanifest b/Emscripten.BuildSystem.vs2017/source.extension.vsixmanifest
@@ -17,8 +17,6 @@
     <Assets>
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Emscripten.Build.CppTasks" Path="|Emscripten.Build.CppTasks|" AssemblyName="|Emscripten.Build.CppTasks;AssemblyName|" d:VsixSubPath="$VCTargets\Platforms\Emscripten" />
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Emscripten.Build.CppTasks" Path="|Emscripten.Build.CppTasks|" AssemblyName="|Emscripten.Build.CppTasks;AssemblyName|" d:VsixSubPath="$MSBuild\Microsoft\VC\v160\Platforms\Emscripten" />
-        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="Emscripten.DebuggerLauncher" Path="|Emscripten.DebuggerLauncher;PkgdefProjectOutputGroup|" />
-        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="Emscripten.DebuggerLauncher" Path="|Emscripten.DebuggerLauncher|" />
     </Assets>
     <Prerequisites>
         <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0, 17.0)" DisplayName="Visual Studio core editor" />

diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/AdapterLauncher.cs b/Emscripten.Debugger.VSCodeDwarfDebug/AdapterLauncher.cs
@@ -4,10 +4,7 @@
 using System;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Debugger.Interop;
-using Microsoft.VisualStudio;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
+using Task = System.Threading.Tasks.Task;
 using Microsoft.VisualStudio.ProjectSystem.VS.Debug;
 using StreamJsonRpc;
 

diff --git a/Emscripten.Debugger.VSCodeDwarfDebug/Emscripten.Debugger.VSCodeDwarfDebug.csproj b/Emscripten.Debugger.VSCodeDwarfDebug/Emscripten.Debugger.VSCodeDwarfDebug.csproj
@@ -474,6 +474,31 @@
     <Compile Include="AdapterLauncher.cs" />
     <Compile Include="CustomMessageHandler.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Debugger.DebugAdapterHost.Interfaces">
+      <Version>15.6.20118.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.ProjectSystem">
+      <Version>15.8.243</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.SDK">
+      <Version>15.8.243</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Shared.VSCodeDebugProtocol">
+      <Version>15.6.20118.1</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.3</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0">
+      <Version>15.9.28307</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop">
+      <Version>7.10.6072</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Emscripten.DebuggerLauncher/WasmDebuggerLaunchProvider.cs b/Emscripten.DebuggerLauncher/WasmDebuggerLaunchProvider.cs
@@ -52,7 +52,7 @@ public override async Task<IReadOnlyList<IDebugLaunchSettings>> QueryDebugTarget
                 chromeFlags: await debuggerProperties.WasmDebuggerChromeFlags.GetEvaluatedValueAtEndAsync(),
                 chromeUserDataDirectory: await debuggerProperties.WasmDebuggerChromeUserDataDirectory.GetEvaluatedValueAtEndAsync(),
                 chromeIgnoreDefaultFlags: await debuggerProperties.WasmDebuggerChromeIgnoreDefaultFlags.GetEvaluatedValueAtEndAsync(),
-                debugAdapterExecutable
+                debugAdapterExecutable: debugAdapterExecutable
             );
 
             debugServerSettings.LaunchOperation = DebugLaunchOperation.CreateProcess;