CR feedback

Author: SteveSandersonMS

.github/workflows/dotnet-sdk-tests.yml

@@ -80,5 +80,4 @@ jobs:
       - name: Run .NET SDK tests
         env:
           COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
-          COPILOT_CLI_PATH: ${{ steps.setup-copilot.outputs.cli-path }}
         run: dotnet test --no-build -v n

dotnet/src/Client.cs

@@ -975,7 +975,7 @@ private async Task VerifyProtocolVersionAsync(Connection connection, Cancellatio
     private static string? GetBundledCliPath(out string searchedPath)
     {
         var binaryName = OperatingSystem.IsWindows() ? "copilot.exe" : "copilot";
-        var rid = System.Runtime.InteropServices.RuntimeInformation.RuntimeIdentifier;
+        var rid = Path.GetFileName(System.Runtime.InteropServices.RuntimeInformation.RuntimeIdentifier);
         searchedPath = Path.Combine(AppContext.BaseDirectory, "runtimes", rid, "native", binaryName);
         return File.Exists(searchedPath) ? searchedPath : null;
     }

dotnet/src/Types.cs

@@ -24,6 +24,9 @@ public enum ConnectionState
 
 public class CopilotClientOptions
 {
+    /// <summary>
+    /// Path to the Copilot CLI executable. If not specified, uses the bundled CLI from the SDK.
+    /// </summary>
     public string? CliPath { get; set; }
     public string[]? CliArgs { get; set; }
     public string? Cwd { get; set; }

dotnet/src/build/GitHub.Copilot.SDK.targets

@@ -28,7 +28,7 @@
 
   <!-- Download and extract CLI binary -->
   <Target Name="_DownloadCopilotCli" BeforeTargets="BeforeBuild" Condition="'$(_CopilotPlatform)' != ''">
-    <Error Condition="'$(CopilotCliVersion)' == ''" Text="CopilotCliVersion is not set. The GitHub.Copilot.SDK.Version.props file may be missing from the NuGet package." />
+    <Error Condition="'$(CopilotCliVersion)' == ''" Text="CopilotCliVersion is not set. The GitHub.Copilot.SDK.props file may be missing from the NuGet package." />
 
     <!-- Compute paths using version (now available) -->
     <PropertyGroup>
@@ -38,14 +38,21 @@
       <_CopilotDownloadUrl>https://registry.npmjs.org/@github/copilot-$(_CopilotPlatform)/-/copilot-$(_CopilotPlatform)-$(CopilotCliVersion).tgz</_CopilotDownloadUrl>
     </PropertyGroup>
 
+    <!-- Delete archive if binary missing (handles partial/corrupted downloads) -->
+    <Delete Files="$(_CopilotArchivePath)" Condition="!Exists('$(_CopilotCliBinaryPath)') And Exists('$(_CopilotArchivePath)')" />
+
     <!-- Download if not cached -->
     <MakeDir Directories="$(_CopilotCacheDir)" Condition="!Exists('$(_CopilotCliBinaryPath)')" />
     <Message Importance="high" Text="Downloading Copilot CLI $(CopilotCliVersion) for $(_CopilotPlatform)..." Condition="!Exists('$(_CopilotCliBinaryPath)')" />
     <DownloadFile SourceUrl="$(_CopilotDownloadUrl)" DestinationFolder="$(_CopilotCacheDir)" DestinationFileName="copilot.tgz"
-                  Condition="!Exists('$(_CopilotCliBinaryPath)') And !Exists('$(_CopilotArchivePath)')" />
+                  Condition="!Exists('$(_CopilotCliBinaryPath)')" />
 
-    <!-- Extract using tar -->
-    <Exec Command="tar -xzf &quot;$(_CopilotArchivePath)&quot; --strip-components=1 -C &quot;$(_CopilotCacheDir)&quot;"
+    <!-- Extract using tar (use Windows system tar explicitly to avoid Git bash tar issues) -->
+    <PropertyGroup>
+      <_TarCommand Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(SystemRoot)\System32\tar.exe</_TarCommand>
+      <_TarCommand Condition="'$(_TarCommand)' == ''">tar</_TarCommand>
+    </PropertyGroup>
+    <Exec Command="&quot;$(_TarCommand)&quot; -xzf &quot;$(_CopilotArchivePath)&quot; --strip-components=1 -C &quot;$(_CopilotCacheDir)&quot;"
           Condition="!Exists('$(_CopilotCliBinaryPath)')" />
 
     <Error Condition="!Exists('$(_CopilotCliBinaryPath)')" Text="Failed to extract Copilot CLI binary to $(_CopilotCliBinaryPath)" />