Skip to content

Commit

Permalink
Merge pull request #4268 from mikem8361/release/stable
Browse files Browse the repository at this point in the history
Update release/stable with latest main
  • Loading branch information
hoyosjs authored Sep 28, 2023
2 parents 6245a3e + 5235d9f commit 5852a32
Show file tree
Hide file tree
Showing 64 changed files with 1,499 additions and 879 deletions.
28 changes: 14 additions & 14 deletions diagnostics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,12 @@ extends:
Build_Release:
_BuildConfig: Release
_BuildArch: x64
_PublishArtifacts: bin/Linux.x64.Release
_PublishArtifacts: bin/linux.x64.Release
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
Build_Debug:
_BuildConfig: Debug
_BuildArch: x64
_PublishArtifacts: bin/Linux.x64.Debug
_PublishArtifacts: bin/linux.x64.Debug

- template: /eng/pipelines/build.yml
parameters:
Expand All @@ -153,14 +153,14 @@ extends:
Build_Release:
_BuildConfig: Release
_BuildArch: x64
_PublishArtifacts: bin/Linux.x64.Release
_ArtifactsTargetPath: bin/Linux-musl.x64.Release
_PublishArtifacts: bin/linux.x64.Release
_ArtifactsTargetPath: bin/linux-musl.x64.Release
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
Build_Debug:
_BuildConfig: Debug
_BuildArch: x64
_PublishArtifacts: bin/Linux.x64.Debug
_ArtifactsTargetPath: bin/Linux-musl.x64.Debug
_PublishArtifacts: bin/linux.x64.Debug
_ArtifactsTargetPath: bin/linux-musl.x64.Debug

- template: /eng/pipelines/build.yml
parameters:
Expand All @@ -171,7 +171,7 @@ extends:
Build_Release:
_BuildConfig: Release
_BuildArch: x64
_PublishArtifacts: bin/OSX.x64.Release
_PublishArtifacts: bin/osx.x64.Release
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -188,7 +188,7 @@ extends:
Build_Release:
_BuildConfig: Release
_BuildArch: arm64
_PublishArtifacts: bin/OSX.arm64.Release
_PublishArtifacts: bin/osx.arm64.Release
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -207,7 +207,7 @@ extends:
Build_Release:
_BuildConfig: Release
_BuildArch: arm
_PublishArtifacts: bin/Linux.arm.Release
_PublishArtifacts: bin/linux.arm.Release

- template: /eng/pipelines/build.yml
parameters:
Expand All @@ -221,7 +221,7 @@ extends:
Build_Release:
_BuildConfig: Release
_BuildArch: arm64
_PublishArtifacts: bin/Linux.arm64.Release
_PublishArtifacts: bin/linux.arm64.Release

- template: /eng/pipelines/build.yml
parameters:
Expand All @@ -236,8 +236,8 @@ extends:
Build_Release:
_BuildConfig: Release
_BuildArch: arm
_PublishArtifacts: bin/Linux.arm.Release
_ArtifactsTargetPath: bin/Linux-musl.arm.Release
_PublishArtifacts: bin/linux.arm.Release
_ArtifactsTargetPath: bin/linux-musl.arm.Release

- template: /eng/pipelines/build.yml
parameters:
Expand All @@ -252,8 +252,8 @@ extends:
Build_Release:
_BuildConfig: Release
_BuildArch: arm64
_PublishArtifacts: bin/Linux.arm64.Release
_ArtifactsTargetPath: bin/Linux-musl.arm64.Release
_PublishArtifacts: bin/linux.arm64.Release
_ArtifactsTargetPath: bin/linux-musl.arm64.Release

############################
# #
Expand Down
65 changes: 64 additions & 1 deletion documentation/design-docs/ipc-protocol.md
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ enum class ProcessCommandId : uint8_t
EnablePerfMap = 0x05,
DisablePerfMap = 0x06,
ApplyStartupHook = 0x07
ProcessInfo3 = 0x08,
// future
}
```
Expand Down Expand Up @@ -804,7 +805,7 @@ In the event of an [error](#Errors), the runtime will attempt to send an error m

#### Inputs:

Header: `{ Magic; Size; 0x0402; 0x0000 }`
Header: `{ Magic; Size; 0x0404; 0x0000 }`

There is no payload.

Expand Down Expand Up @@ -848,6 +849,8 @@ struct Payload
}
```
> Available since .NET 7.0
### `EnablePerfMap`
Command Code: `0x0405`
Expand Down Expand Up @@ -972,6 +975,66 @@ struct Payload
> Available since .NET 8.0
### `ProcessInfo3`
Command Code: `0x0408`
The `ProcessInfo3` command queries the runtime for some basic information about the process. The returned payload is versioned and fields will be added over time.
In the event of an [error](#Errors), the runtime will attempt to send an error message and subsequently close the connection.
#### Inputs:
Header: `{ Magic; Size; 0x0408; 0x0000 }`
There is no payload.
#### Returns (as an IPC Message Payload):
Header: `{ Magic; size; 0xFF00; 0x0000; }`
Payload:
* `uint32 version`: the version of the payload returned. Future versions can add new fields after the end of the current structure, but will never remove or change any field that has already been defined.
* `uint64 processId`: the process id in the process's PID-space
* `GUID runtimeCookie`: a 128-bit GUID that should be unique across PID-spaces
* `string commandLine`: the command line that invoked the process
* Windows: will be the same as the output of `GetCommandLineW`
* Non-Windows: will be the fully qualified path of the executable in `argv[0]` followed by all arguments as the appear in `argv` separated by spaces, i.e., `/full/path/to/argv[0] argv[1] argv[2] ...`
* `string OS`: the operating system that the process is running on
* macOS => `"macOS"`
* Windows => `"Windows"`
* Linux => `"Linux"`
* other => `"Unknown"`
* `string arch`: the architecture of the process
* 32-bit => `"x86"`
* 64-bit => `"x64"`
* ARM32 => `"arm32"`
* ARM64 => `"arm64"`
* Other => `"Unknown"`
* `string managedEntrypointAssemblyName`: the assembly name from the assembly identity of the entrypoint assembly of the process. This is the same value that is returned from executing `System.Reflection.Assembly.GetEntryAssembly().GetName().Name` in the target process.
* `string clrProductVersion`: the product version of the CLR of the process; may contain prerelease label information e.g. `6.0.0-preview.6.#####`
* `string runtimeIdentifier`: information to identify the platform this runtime targets, e.g. `linux_musl_arm`64, `linux_x64`, or `windows_x64` are all valid identifiers. See [.NET RID Catalog](https://learn.microsoft.com/en-us/dotnet/core/rid-catalog) for more information.
##### Details:
Returns:
```c++
struct Payload
{
uint32_t Version;
uint64_t ProcessId;
LPCWSTR CommandLine;
LPCWSTR OS;
LPCWSTR Arch;
GUID RuntimeCookie;
LPCWSTR ManagedEntrypointAssemblyName;
LPCWSTR ClrProductVersion;
LPCWSTR RuntimeIdentifier;
}
```

> Available since .NET 8.0

## Errors

In the event an error occurs in the handling of an Ipc Message, the Diagnostic Server will attempt to send an Ipc Message encoding the error and subsequently close the connection. The connection will be closed **regardless** of the success of sending the error message. The Client is expected to be resilient in the event of a connection being abruptly closed.
Expand Down
52 changes: 26 additions & 26 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.SymbolStore" Version="1.0.442101">
<Dependency Name="Microsoft.SymbolStore" Version="1.0.446801">
<Uri>https://github.com/dotnet/symstore</Uri>
<Sha>df78bdccafe0dca31c9e6a1b5c3cf21c33e8f9a1</Sha>
<Sha>8cc6f03fdbd9c79f0bf9ffbe0a788dca1a81348a</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="3.0.442202">
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="3.0.447501">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>c7ec730380da83d9dcb63a3d8928da701219db8e</Sha>
<Sha>6d7c5a7288c0e93e5eb56893a6064575ac6e3ea8</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="3.0.442202">
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="3.0.447501">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>c7ec730380da83d9dcb63a3d8928da701219db8e</Sha>
<Sha>6d7c5a7288c0e93e5eb56893a6064575ac6e3ea8</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23419.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>385129cbc980a515ddee2fa56f6b16f3183ed9bc</Sha>
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23419.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23463.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>385129cbc980a515ddee2fa56f6b16f3183ed9bc</Sha>
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.2.23420.6">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rtm.23474.2">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>ec2c1ec1b16874f748cfc5d1f7da769be90e10c8</Sha>
<Sha>f8a61a24ac843529a82a8f6ede35fc08a6fb8c35</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rc.2.23422.15">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rtm.23476.22">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>5d4e6d3812805e81a2f4ed9f2c06784204a98013</Sha>
<Sha>4292763bd5143205daabb682311ee34f23897d9b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rc.2.23422.15">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rtm.23476.22">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>5d4e6d3812805e81a2f4ed9f2c06784204a98013</Sha>
<Sha>4292763bd5143205daabb682311ee34f23897d9b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23410.15">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rtm.23476.15">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>786b9872ad306d5b0febdc2e6c820b69e0e232dc</Sha>
<Sha>0933e300f0c0647a15a0433f1a3b07bcab9882f4</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23410.15">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rtm.23476.15">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>786b9872ad306d5b0febdc2e6c820b69e0e232dc</Sha>
<Sha>0933e300f0c0647a15a0433f1a3b07bcab9882f4</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23421.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23475.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>f4903e46459e0348e3793055dd8b68b8b0264034</Sha>
<Sha>0650b50b2a5263c735d12b5c36c5deb34e7e6b60</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-1.23073.4">
Expand All @@ -60,13 +60,13 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.3.5-beta1.23124.1">
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23420.2">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>c6352bf2e1bd214fce090829de1042000d021497</Sha>
<Sha>76d99c5f3e11f0600fae074270c0d89042c360f0</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview1.23124.1">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23420.2">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>c6352bf2e1bd214fce090829de1042000d021497</Sha>
<Sha>76d99c5f3e11f0600fae074270c0d89042c360f0</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
34 changes: 17 additions & 17 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@
</PropertyGroup>
<PropertyGroup>
<!-- Latest symstore version updated by darc -->
<MicrosoftSymbolStoreVersion>1.0.442101</MicrosoftSymbolStoreVersion>
<MicrosoftSymbolStoreVersion>1.0.446801</MicrosoftSymbolStoreVersion>
<!-- Latest shared runtime version updated by darc -->
<VSRedistCommonNetCoreSharedFrameworkx6480Version>8.0.0-rc.1.23410.15</VSRedistCommonNetCoreSharedFrameworkx6480Version>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-rc.1.23410.15</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6480Version>8.0.0-rtm.23476.15</VSRedistCommonNetCoreSharedFrameworkx6480Version>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-rtm.23476.15</MicrosoftNETCoreAppRuntimewinx64Version>
<!-- Latest shared aspnetcore version updated by darc -->
<MicrosoftAspNetCoreAppRefInternalVersion>8.0.0-rc.2.23422.15</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>8.0.0-rc.2.23422.15</MicrosoftAspNetCoreAppRefVersion>
<MicrosoftAspNetCoreAppRefInternalVersion>8.0.0-rtm.23476.22</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>8.0.0-rtm.23476.22</MicrosoftAspNetCoreAppRefVersion>
<!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
<MicrosoftDotnetSdkInternalVersion>8.0.100-rc.2.23420.6</MicrosoftDotnetSdkInternalVersion>
<MicrosoftDotnetSdkInternalVersion>8.0.100-rtm.23474.2</MicrosoftDotnetSdkInternalVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime versions to test -->
<MicrosoftNETCoreApp60Version>6.0.19</MicrosoftNETCoreApp60Version>
<MicrosoftAspNetCoreApp60Version>$(MicrosoftNETCoreApp60Version)</MicrosoftAspNetCoreApp60Version>
<MicrosoftNETCoreApp70Version>7.0.10</MicrosoftNETCoreApp70Version>
<MicrosoftNETCoreApp70Version>7.0.11</MicrosoftNETCoreApp70Version>
<MicrosoftAspNetCoreApp70Version>$(MicrosoftNETCoreApp70Version)</MicrosoftAspNetCoreApp70Version>
<!-- The SDK runtime version used to build single-file apps (currently hardcoded) -->
<SingleFileRuntime60Version>$(MicrosoftNETCoreApp60Version)</SingleFileRuntime60Version>
<SingleFileRuntime70Version>$(MicrosoftNETCoreApp70Version)</SingleFileRuntime70Version>
<SingleFileRuntimeLatestVersion>8.0.0-rc.1.23414.4</SingleFileRuntimeLatestVersion>
<SingleFileRuntimeLatestVersion>8.0.0-rtm.23472.12</SingleFileRuntimeLatestVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Opt-in/out repo features -->
Expand All @@ -45,8 +45,8 @@
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<!-- Other libs -->
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftDiagnosticsRuntimeVersion>3.0.442202</MicrosoftDiagnosticsRuntimeVersion>
<MicrosoftDiaSymReaderNativePackageVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativePackageVersion>
<MicrosoftDiagnosticsRuntimeVersion>3.0.447501</MicrosoftDiagnosticsRuntimeVersion>
<MicrosoftDiaSymReaderNativeVersion>16.11.27-beta1.23180.1</MicrosoftDiaSymReaderNativeVersion>
<MicrosoftDiagnosticsTracingTraceEventVersion>3.0.7</MicrosoftDiagnosticsTracingTraceEventVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
Expand All @@ -61,12 +61,12 @@
<SystemTextEncodingsWebVersion>4.7.2</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>4.7.1</SystemTextJsonVersion>
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23419.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23463.1</MicrosoftDotNetCodeAnalysisVersion>
<StyleCopAnalyzersVersion>1.2.0-beta.406</StyleCopAnalyzersVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
<cdbsosversion>10.0.18362</cdbsosversion>
<NewtonSoftJsonVersion>13.0.1</NewtonSoftJsonVersion>
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>8.0.0-alpha.1.23421.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>9.0.0-alpha.1.23475.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
<!-- Roslyn and analyzers -->
<!-- Compatibility with VS 16.11/.NET SDK 5.0.4xx -->
<MicrosoftCodeAnalysisVersion_3_11>3.11.0</MicrosoftCodeAnalysisVersion_3_11>
Expand All @@ -80,8 +80,8 @@
<MicrosoftCodeAnalysisVersion_4_4>4.4.0</MicrosoftCodeAnalysisVersion_4_4>
<MicrosoftCodeAnalysisVersion_LatestVS>4.4.0</MicrosoftCodeAnalysisVersion_LatestVS>
<MicrosoftCodeAnalysisVersion_LatestVS Condition="'$(DotNetBuildFromSource)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersion_LatestVS>
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.5-beta1.23124.1</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview1.23124.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23420.2</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23420.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!--
These packages affect the design-time experience in VS, so we update them at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
-->
Expand All @@ -92,8 +92,8 @@
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
they do not break the local dev experience.
-->
<MicrosoftCodeAnalysisCSharpVersion>4.6.0-1.23073.4</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.6.0-1.23073.4</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.6.0-1.23073.4</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.8.0-2.23422.14</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.8.0-2.23422.14</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.8.0-2.23422.14</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
</Project>
Loading

0 comments on commit 5852a32

Please sign in to comment.