Skip to content

Commit 70a34c3

Browse files
author
Mike McLaughlin
authored
Update release/stable from main (#5082)
2 parents 6fbd6fb + d2e7b8d commit 70a34c3

14 files changed

Lines changed: 63 additions & 42 deletions

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<add key="darc-pub-dotnet-aspnetcore-401ae7c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-401ae7cb/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-aspnetcore -->
1212
<!-- Begin: Package sources from dotnet-runtime -->
13-
<add key="darc-pub-dotnet-runtime-f6615d2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-f6615d27/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-runtime-462630b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-462630b3/nuget/v3/index.json" />
1414
<!-- End: Package sources from dotnet-runtime -->
1515
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1616
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />

‎diagnostics.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ extends:
7777
architecture: x86
7878
artifactUploadPath: bin/Windows_NT.x86.Release
7979
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
80-
- configuration: Release
81-
architecture: arm
82-
artifactUploadPath: bin/Windows_NT.arm.Release
8380
- configuration: Release
8481
architecture: arm64
8582
artifactUploadPath: bin/Windows_NT.arm64.Release

‎eng/Version.Details.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@
4242
</Dependency>
4343
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.1">
4444
<Uri>https://github.com/dotnet/runtime</Uri>
45-
<Sha>f6615d27fdbef2e7216d9762aaea9a6aa49e1be5</Sha>
45+
<Sha>462630b3c311cade6426c53e9b3ee3b89bf217a2</Sha>
4646
</Dependency>
47-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.1-rtm.24576.8">
47+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.1-servicing.24603.13">
4848
<Uri>https://github.com/dotnet/runtime</Uri>
49-
<Sha>f6615d27fdbef2e7216d9762aaea9a6aa49e1be5</Sha>
49+
<Sha>462630b3c311cade6426c53e9b3ee3b89bf217a2</Sha>
5050
</Dependency>
5151
<!-- Intermediate is necessary for source build. -->
52-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.557602">
52+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.560201">
5353
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
54-
<Sha>450c665d6f838ff0ede862b20e30f80b9d7846a0</Sha>
54+
<Sha>dd1d66ed9123ad8f993b1c00711f2c50f7f48a96</Sha>
5555
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
5656
</Dependency>
5757
<Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-2.24271.11">

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717
<PropertyGroup>
1818
<!-- Latest shared runtime version updated by darc -->
19-
<VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.1-rtm.24576.8</VSRedistCommonNetCoreSharedFrameworkx6490Version>
19+
<VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.1-servicing.24603.13</VSRedistCommonNetCoreSharedFrameworkx6490Version>
2020
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
2121
<!-- Latest shared aspnetcore version updated by darc -->
2222
<MicrosoftAspNetCoreAppRefInternalVersion>9.0.1-rtm.24577.14</MicrosoftAspNetCoreAppRefInternalVersion>
@@ -60,7 +60,7 @@
6060
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
6161
<cdbsosversion>10.0.26100.1</cdbsosversion>
6262
<NewtonSoftJsonVersion>13.0.1</NewtonSoftJsonVersion>
63-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.557602</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
63+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.560201</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
6464
<!-- Roslyn and analyzers -->
6565
<!-- dotnet/roslyn dependencies -->
6666
<!--

‎eng/release/tool-list.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
"AssetList": [
55
{
66
"name": "dotnet-counters",
7-
"rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
7+
"rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
88
},
99
{
1010
"name": "dotnet-dump",
11-
"rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
11+
"rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
1212
},
1313
{
1414
"name": "dotnet-gcdump",
15-
"rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
15+
"rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
1616
},
1717
{
1818
"name": "dotnet-sos",
19-
"rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
19+
"rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
2020
},
2121
{
2222
"name": "dotnet-trace",
23-
"rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
23+
"rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
2424
},
2525
{
2626
"name": "dotnet-stack",
27-
"rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
27+
"rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
2828
},
2929
{
3030
"name": "dotnet-dsrouter",
31-
"rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
31+
"rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
3232
},
3333
{
3434
"name": "dotnet-symbol",
35-
"rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
35+
"rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
3636
}
3737
]
3838
},

‎src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/DiagnosticsClient.cs‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Globalization;
99
using System.IO;
1010
using System.Linq;
11+
using System.Runtime.InteropServices;
1112
using System.Text.RegularExpressions;
1213
using System.Threading;
1314
using System.Threading.Tasks;
@@ -380,6 +381,47 @@ internal async Task DisablePerfMapAsync(CancellationToken token)
380381
ValidateResponseMessage(response, nameof(DisablePerfMapAsync));
381382
}
382383

384+
/// <summary>
385+
/// Create a new DiagnosticsClient instance using the specified diagnostic port.
386+
/// </summary>
387+
/// <param name="diagnosticPort">The diagnostic port.</param>
388+
/// <param name="ct">The token to monitor for cancellation requests.</param>
389+
public static async Task<DiagnosticsClient> FromDiagnosticPort(string diagnosticPort, CancellationToken ct)
390+
{
391+
if (diagnosticPort is null)
392+
{
393+
throw new ArgumentNullException(nameof(diagnosticPort));
394+
}
395+
396+
IpcEndpointConfig portConfig = IpcEndpointConfig.Parse(diagnosticPort);
397+
398+
if (portConfig.IsListenConfig)
399+
{
400+
string fullPort = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? portConfig.Address : Path.GetFullPath(portConfig.Address);
401+
ReversedDiagnosticsServer server = new(fullPort);
402+
server.Start();
403+
404+
try
405+
{
406+
IpcEndpointInfo endpointInfo = await server.AcceptAsync(ct).ConfigureAwait(false);
407+
return new DiagnosticsClient(endpointInfo.Endpoint);
408+
}
409+
catch (TaskCanceledException)
410+
{
411+
//clean up the server
412+
await server.DisposeAsync().ConfigureAwait(false);
413+
if (!ct.IsCancellationRequested)
414+
{
415+
throw;
416+
}
417+
return null;
418+
}
419+
}
420+
421+
Debug.Assert(portConfig.IsConnectConfig);
422+
return new DiagnosticsClient(portConfig);
423+
}
424+
383425
/// <summary>
384426
/// Get all the active processes that can be attached to.
385427
/// </summary>

‎src/SOS/SOS.Package/SOS.Package.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<Files>
4545
<File Architecture="amd64" Module="win-x64\sos.dll" />
4646
<File Architecture="x86" Module="win-x86\sos.dll" />
47-
<File Architecture="arm32" Module="win-arm\sos.dll" />
4847
<File Architecture="arm64" Module="win-arm64\sos.dll" />
4948
</Files>
5049
<LoadTriggers>

‎src/SOS/SOS.Package/SOS.Symbol.Package.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
<None Include="$(ArtifactsBinDir)\Windows_NT.x86.$(Configuration)\PDB\sos.pdb" Pack="true" Visible="false">
2828
<PackagePath>$(SOSPackagePathPrefix)/win-x86</PackagePath>
2929
</None>
30-
<None Include="$(ArtifactsBinDir)\Windows_NT.arm.$(Configuration)\PDB\sos.pdb" Pack="true" Visible="false">
31-
<PackagePath>$(SOSPackagePathPrefix)/win-arm</PackagePath>
32-
</None>
3330
<None Include="$(ArtifactsBinDir)\Windows_NT.arm64.$(Configuration)\PDB\sos.pdb" Pack="true" Visible="false">
3431
<PackagePath>$(SOSPackagePathPrefix)/win-arm64</PackagePath>
3532
</None>

‎src/Tools/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
<PropertyGroup>
2424
<IsPackable>true</IsPackable>
2525
<PackAsTool>true</PackAsTool>
26-
<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;win-arm;osx-x64</PackAsToolShimRuntimeIdentifiers>
26+
<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
2727
<PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
2828
</PropertyGroup>
2929
</Otherwise>
3030
</Choose>
31-
</Project>
31+
</Project>

‎src/dbgshim/dbgshim.vcxproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,6 @@
378378
<None Include="pkg\Microsoft.Diagnostics.DbgShim.osx-x64.proj" />
379379
<None Include="pkg\Microsoft.Diagnostics.DbgShim.proj" />
380380
<None Include="pkg\Microsoft.Diagnostics.DbgShim.props" />
381-
<None Include="pkg\Microsoft.Diagnostics.DbgShim.win-arm.proj" />
382381
<None Include="pkg\Microsoft.Diagnostics.DbgShim.win-arm64.proj" />
383382
<None Include="pkg\Microsoft.Diagnostics.DbgShim.win-x64.proj" />
384383
<None Include="pkg\Microsoft.Diagnostics.DbgShim.win-x86.proj" />
@@ -393,4 +392,4 @@
393392
<ImportGroup Label="ExtensionTargets">
394393
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
395394
</ImportGroup>
396-
</Project>
395+
</Project>

0 commit comments

Comments
 (0)