Skip to content

Commit e1eaf1b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0.1xx] Source code updates from dotnet/diagnostics (#2619)
[release/10.0.1xx] Source code updates from dotnet/diagnostics
1 parent 98aa2b1 commit e1eaf1b

File tree

7 files changed

+73
-56
lines changed

7 files changed

+73
-56
lines changed

‎src/diagnostics/eng/Version.Details.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ This file should be imported by eng/Versions.props
1313
<!-- dotnet/android dependencies -->
1414
<XamarinAndroidToolsAndroidSdkPackageVersion>1.0.105-preview.225</XamarinAndroidToolsAndroidSdkPackageVersion>
1515
<!-- dotnet/dotnet dependencies -->
16-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-rc.2.25464.104</MicrosoftAspNetCoreAppRefPackageVersion>
17-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-rc.2.25464.104</MicrosoftAspNetCoreAppRefInternalPackageVersion>
18-
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25464.104</MicrosoftCodeAnalysisPackageVersion>
19-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25464.104</MicrosoftCodeAnalysisAnalyzersPackageVersion>
20-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25464.104</MicrosoftCodeAnalysisCSharpPackageVersion>
21-
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.100-rc.2.25464.104</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
22-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25464.104</MicrosoftDotNetArcadeSdkPackageVersion>
23-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25464.104</MicrosoftDotNetCodeAnalysisPackageVersion>
24-
<MicrosoftNETSdkPackageVersion>10.0.100-rc.2.25464.104</MicrosoftNETSdkPackageVersion>
25-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25464.104</MicrosoftNETCoreAppRefPackageVersion>
26-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25464.104</MicrosoftNETCorePlatformsPackageVersion>
27-
<runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25464.104</runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>
28-
<runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25464.104</runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>
29-
<runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25464.104</runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>
30-
<runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25464.104</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
31-
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25464.104</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
32-
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25464.104</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
16+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-rc.2.25473.111</MicrosoftAspNetCoreAppRefPackageVersion>
17+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-rc.2.25473.111</MicrosoftAspNetCoreAppRefInternalPackageVersion>
18+
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25473.111</MicrosoftCodeAnalysisPackageVersion>
19+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25473.111</MicrosoftCodeAnalysisAnalyzersPackageVersion>
20+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25473.111</MicrosoftCodeAnalysisCSharpPackageVersion>
21+
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.100-rc.2.25473.111</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
22+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25473.111</MicrosoftDotNetArcadeSdkPackageVersion>
23+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25473.111</MicrosoftDotNetCodeAnalysisPackageVersion>
24+
<MicrosoftNETSdkPackageVersion>10.0.100-rc.2.25473.111</MicrosoftNETSdkPackageVersion>
25+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25473.111</MicrosoftNETCoreAppRefPackageVersion>
26+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25473.111</MicrosoftNETCorePlatformsPackageVersion>
27+
<runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25473.111</runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>
28+
<runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25473.111</runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>
29+
<runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25473.111</runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>
30+
<runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25473.111</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
31+
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25473.111</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
32+
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>10.0.0-rc.2.25473.111</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
3333
<!-- dotnet/arcade dependencies -->
3434
<MicrosoftDotNetRemoteExecutorPackageVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorPackageVersion>
3535
</PropertyGroup>

‎src/diagnostics/eng/Version.Details.xml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Dependencies>
2-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="diagnostics" Sha="87cc9e9aebf530502d4450dd9b4682b8caa722b2" BarId="283152" />
2+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="diagnostics" Sha="537ecf871e65b50bbe5c8d70c284caa87b69b3cd" BarId="284571" />
33
<ProductDependencies>
44
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.0-beta.25381.2">
55
<Uri>https://github.com/microsoft/clrmd</Uri>
@@ -19,77 +19,77 @@
1919
</Dependency>
2020
</ProductDependencies>
2121
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25464.104">
22+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25473.111">
2323
<Uri>https://github.com/dotnet/dotnet</Uri>
24-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
24+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25464.104">
26+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25473.111">
2727
<Uri>https://github.com/dotnet/dotnet</Uri>
28-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
28+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
3232
<Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.2.25464.104">
34+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.2.25473.111">
3535
<Uri>https://github.com/dotnet/dotnet</Uri>
36-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
36+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-rc.2.25464.104">
38+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-rc.2.25473.111">
3939
<Uri>https://github.com/dotnet/dotnet</Uri>
40-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
40+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-rc.2.25464.104">
42+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-rc.2.25473.111">
4343
<Uri>https://github.com/dotnet/dotnet</Uri>
44-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
44+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25464.104">
46+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25473.111">
4747
<Uri>https://github.com/dotnet/dotnet</Uri>
48-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
48+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25464.104">
50+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25473.111">
5151
<Uri>https://github.com/dotnet/dotnet</Uri>
52-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
52+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
5353
</Dependency>
54-
<Dependency Name="runtime.win-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25464.104">
54+
<Dependency Name="runtime.win-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25473.111">
5555
<Uri>https://github.com/dotnet/dotnet</Uri>
56-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
56+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
5757
</Dependency>
58-
<Dependency Name="runtime.win-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25464.104">
58+
<Dependency Name="runtime.win-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25473.111">
5959
<Uri>https://github.com/dotnet/dotnet</Uri>
60-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
60+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
6161
</Dependency>
62-
<Dependency Name="runtime.linux-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25464.104">
62+
<Dependency Name="runtime.linux-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25473.111">
6363
<Uri>https://github.com/dotnet/dotnet</Uri>
64-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
64+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
6565
</Dependency>
66-
<Dependency Name="runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25464.104">
66+
<Dependency Name="runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25473.111">
6767
<Uri>https://github.com/dotnet/dotnet</Uri>
68-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
68+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
6969
</Dependency>
70-
<Dependency Name="runtime.osx-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25464.104">
70+
<Dependency Name="runtime.osx-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25473.111">
7171
<Uri>https://github.com/dotnet/dotnet</Uri>
72-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
72+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
7373
</Dependency>
74-
<Dependency Name="runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25464.104">
74+
<Dependency Name="runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.0-rc.2.25473.111">
7575
<Uri>https://github.com/dotnet/dotnet</Uri>
76-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
76+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25464.104">
78+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25473.111">
7979
<Uri>https://github.com/dotnet/dotnet</Uri>
80-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
80+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25464.104">
82+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25473.111">
8383
<Uri>https://github.com/dotnet/dotnet</Uri>
84-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
84+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-2.25464.104">
86+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-2.25473.111">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
88+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100-rc.2.25464.104">
90+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100-rc.2.25473.111">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>87cc9e9aebf530502d4450dd9b4682b8caa722b2</Sha>
92+
<Sha>537ecf871e65b50bbe5c8d70c284caa87b69b3cd</Sha>
9393
</Dependency>
9494
</ToolsetDependencies>
9595
</Dependencies>

‎src/diagnostics/eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ parameters:
4040

4141
repositoryAlias: self
4242

43+
officialBuildId: ''
44+
4345
jobs:
4446
- job: Asset_Registry_Publish
4547

@@ -62,6 +64,11 @@ jobs:
6264
value: false
6365
# unconditional - needed for logs publishing (redactor tool version)
6466
- template: /eng/common/core-templates/post-build/common-variables.yml
67+
- name: OfficialBuildId
68+
${{ if ne(parameters.officialBuildId, '') }}:
69+
value: ${{ parameters.officialBuildId }}
70+
${{ else }}:
71+
value: $(Build.BuildNumber)
6572

6673
pool:
6774
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -124,7 +131,7 @@ jobs:
124131
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
125132
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
126133
/p:MaestroApiEndpoint=https://maestro.dot.net
127-
/p:OfficialBuildId=$(Build.BuildNumber)
134+
/p:OfficialBuildId=$(OfficialBuildId)
128135
condition: ${{ parameters.condition }}
129136
continueOnError: ${{ parameters.continueOnError }}
130137

‎src/diagnostics/eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ parameters:
4444
artifacts: {}
4545
is1ESPipeline: ''
4646
repositoryAlias: self
47+
officialBuildId: ''
4748

4849
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4950
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -116,3 +117,4 @@ jobs:
116117
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
117118
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
118119
repositoryAlias: ${{ parameters.repositoryAlias }}
120+
officialBuildId: ${{ parameters.officialBuildId }}

‎src/diagnostics/es-metadata.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
schemaVersion: 0.0.1
2+
isProduction: true
3+
accountableOwners:
4+
service: 1dc8dedc-8f5f-4b94-b182-ec3bdfb207b0
5+
routing:
6+
defaultAreaPath:
7+
org: devdiv
8+
path: DevDiv\NET Runtime\Diagnostics\SDL

‎src/diagnostics/global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
},
1818
"msbuild-sdks": {
1919
"Microsoft.Build.NoTargets": "3.5.0",
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25464.104"
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25473.111"
2121
}
2222
}

‎src/source-manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
"commitSha": "c0c52874069a4dc0fe1e880014e6a5f316e9d3b8"
3232
},
3333
{
34-
"barId": 284034,
34+
"barId": 284760,
3535
"path": "diagnostics",
3636
"remoteUri": "https://github.com/dotnet/diagnostics",
37-
"commitSha": "29b752ed624a2796726cbe9891c8627dd580002d"
37+
"commitSha": "ec34165e5c619df74b17974fbd5bbee0f81776b3"
3838
},
3939
{
4040
"barId": 284682,

0 commit comments

Comments
 (0)