Update dependencies from https://github.com/microsoft/usvc-apiserver …

…build (dotnet#3157) Microsoft.DeveloperControlPlane.darwin-amd64 , Microsoft.DeveloperControlPlane.darwin-arm64 , Microsoft.DeveloperControlPlane.linux-amd64 , Microsoft.DeveloperControlPlane.linux-arm64 , Microsoft.DeveloperControlPlane.windows-386 , Microsoft.DeveloperControlPlane.windows-amd64 , Microsoft.DeveloperControlPlane.windows-arm64 From Version 0.1.58 -> To Version 0.1.60 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1SThierarhyGOD · Mar 25, 2024 · 70d70c7 · 70d70c7
1 parent 4bc1799
commit 70d70c7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 24 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -21,4 +21,4 @@
       ]
     }
   }
-}
+}
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.DeveloperControlPlane.darwin-amd64" Version="0.1.58">
+    <Dependency Name="Microsoft.DeveloperControlPlane.darwin-amd64" Version="0.1.60">
       <Uri>https://github.com/microsoft/usvc-apiserver</Uri>
-      <Sha>f396b29b549cb27602cd7b76e3cb0103cadcb604</Sha>
+      <Sha>67e0cb7547eb6b3c27fc12d94557b865640805ec</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DeveloperControlPlane.darwin-arm64" Version="0.1.58">
+    <Dependency Name="Microsoft.DeveloperControlPlane.darwin-arm64" Version="0.1.60">
       <Uri>https://github.com/microsoft/usvc-apiserver</Uri>
-      <Sha>f396b29b549cb27602cd7b76e3cb0103cadcb604</Sha>
+      <Sha>67e0cb7547eb6b3c27fc12d94557b865640805ec</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DeveloperControlPlane.linux-amd64" Version="0.1.58">
+    <Dependency Name="Microsoft.DeveloperControlPlane.linux-amd64" Version="0.1.60">
       <Uri>https://github.com/microsoft/usvc-apiserver</Uri>
-      <Sha>f396b29b549cb27602cd7b76e3cb0103cadcb604</Sha>
+      <Sha>67e0cb7547eb6b3c27fc12d94557b865640805ec</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DeveloperControlPlane.linux-arm64" Version="0.1.58">
+    <Dependency Name="Microsoft.DeveloperControlPlane.linux-arm64" Version="0.1.60">
       <Uri>https://github.com/microsoft/usvc-apiserver</Uri>
-      <Sha>f396b29b549cb27602cd7b76e3cb0103cadcb604</Sha>
+      <Sha>67e0cb7547eb6b3c27fc12d94557b865640805ec</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DeveloperControlPlane.windows-386" Version="0.1.58">
+    <Dependency Name="Microsoft.DeveloperControlPlane.windows-386" Version="0.1.60">
       <Uri>https://github.com/microsoft/usvc-apiserver</Uri>
-      <Sha>f396b29b549cb27602cd7b76e3cb0103cadcb604</Sha>
+      <Sha>67e0cb7547eb6b3c27fc12d94557b865640805ec</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DeveloperControlPlane.windows-amd64" Version="0.1.58">
+    <Dependency Name="Microsoft.DeveloperControlPlane.windows-amd64" Version="0.1.60">
       <Uri>https://github.com/microsoft/usvc-apiserver</Uri>
-      <Sha>f396b29b549cb27602cd7b76e3cb0103cadcb604</Sha>
+      <Sha>67e0cb7547eb6b3c27fc12d94557b865640805ec</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DeveloperControlPlane.windows-arm64" Version="0.1.58">
+    <Dependency Name="Microsoft.DeveloperControlPlane.windows-arm64" Version="0.1.60">
       <Uri>https://github.com/microsoft/usvc-apiserver</Uri>
-      <Sha>f396b29b549cb27602cd7b76e3cb0103cadcb604</Sha>
+      <Sha>67e0cb7547eb6b3c27fc12d94557b865640805ec</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Http.Resilience" Version="8.2.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -11,13 +11,13 @@
   <PropertyGroup>
     <!-- Package versions defined directly in <reporoot>/Directory.Packages.props -->
     <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rtm.23512.16</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftDeveloperControlPlanedarwinamd64PackageVersion>0.1.58</MicrosoftDeveloperControlPlanedarwinamd64PackageVersion>
-    <MicrosoftDeveloperControlPlanedarwinarm64PackageVersion>0.1.58</MicrosoftDeveloperControlPlanedarwinarm64PackageVersion>
-    <MicrosoftDeveloperControlPlanelinuxamd64PackageVersion>0.1.58</MicrosoftDeveloperControlPlanelinuxamd64PackageVersion>
-    <MicrosoftDeveloperControlPlanelinuxarm64PackageVersion>0.1.58</MicrosoftDeveloperControlPlanelinuxarm64PackageVersion>
-    <MicrosoftDeveloperControlPlanewindows386PackageVersion>0.1.58</MicrosoftDeveloperControlPlanewindows386PackageVersion>
-    <MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>0.1.58</MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>
-    <MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>0.1.58</MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>
+    <MicrosoftDeveloperControlPlanedarwinamd64PackageVersion>0.1.60</MicrosoftDeveloperControlPlanedarwinamd64PackageVersion>
+    <MicrosoftDeveloperControlPlanedarwinarm64PackageVersion>0.1.60</MicrosoftDeveloperControlPlanedarwinarm64PackageVersion>
+    <MicrosoftDeveloperControlPlanelinuxamd64PackageVersion>0.1.60</MicrosoftDeveloperControlPlanelinuxamd64PackageVersion>
+    <MicrosoftDeveloperControlPlanelinuxarm64PackageVersion>0.1.60</MicrosoftDeveloperControlPlanelinuxarm64PackageVersion>
+    <MicrosoftDeveloperControlPlanewindows386PackageVersion>0.1.60</MicrosoftDeveloperControlPlanewindows386PackageVersion>
+    <MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>0.1.60</MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>
+    <MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>0.1.60</MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>
     <MicrosoftDotNetRemoteExecutorPackageVersion>8.0.0-beta.24172.5</MicrosoftDotNetRemoteExecutorPackageVersion>
     <MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.24172.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
     <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24172.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>

diff --git a/eng/dcppack/UnixFilePermissions.xml b/eng/dcppack/UnixFilePermissions.xml
@@ -1,5 +1,4 @@
 <FileList>
   <File Path="tools/dcp" Permission="755"/>
-  <File Path="tools/ext/dcpd" Permission="755"/>
   <File Path="tools/ext/dcpctrl" Permission="755"/>
 </FileList>
diff --git a/src/Aspire.Hosting/Dcp/DcpOptions.cs b/src/Aspire.Hosting/Dcp/DcpOptions.cs
@@ -25,7 +25,7 @@ internal sealed class DcpOptions
     public string? CliPath { get; set; }
 
     /// <summary>
-    /// Optional path to a folder containing the DCP extension assemblies (dcpd, dcpctrl, etc.).
+    /// Optional path to a folder containing the DCP extension assemblies (dcpctrl, etc.).
     /// </summary>
     /// <example>
     /// C:\Program Files\dotnet\packs\Aspire.Hosting.Orchestration.win-x64\8.0.0-preview.1.23518.6\tools\ext\
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,4 @@ @@
           ]
         }
       }
-    }
+    }