Skip to content

Commit b7dfbe4

Browse files
author
Mirroring
committed
Merge commit '76cf20362b912f13c17db56a78dfe65de52295ac'
2 parents df1ae78 + 76cf203 commit b7dfbe4

17 files changed

Lines changed: 136 additions & 110 deletions

File tree

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "11.0.0-prerelease.26064.3",
18+
"version": "11.0.0-prerelease.26117.1",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,18 @@
3535
<UsagePattern IdentityGlob="System.IO.Pipelines/7.0.0" />
3636
<UsagePattern IdentityGlob="System.IO.Pipelines/8.0.*" />
3737
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.0" />
38+
39+
<!-- Dependencies of Roslyn, replaced with live packages during full source build
40+
https://github.com/dotnet/runtime/pull/112937#discussion_r2022951143 -->
41+
<UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/9.0.0" />
42+
<UsagePattern IdentityGlob="System.Collections.Immutable/9.0.0" />
43+
<UsagePattern IdentityGlob="System.Composition/9.0.0" />
44+
<UsagePattern IdentityGlob="System.Composition.AttributedModel/9.0.0" />
45+
<UsagePattern IdentityGlob="System.Composition.Convention/9.0.0" />
46+
<UsagePattern IdentityGlob="System.Composition.Hosting/9.0.0" />
47+
<UsagePattern IdentityGlob="System.Composition.Runtime/9.0.0" />
48+
<UsagePattern IdentityGlob="System.Composition.TypedParts/9.0.0" />
49+
<UsagePattern IdentityGlob="System.IO.Pipelines/9.0.0" />
50+
<UsagePattern IdentityGlob="System.Reflection.Metadata/9.0.0" />
3851
</IgnorePatterns>
3952
</UsageData>

‎eng/Version.Details.xml‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
<Sha>803d8598f98fb4efd94604b32627ee9407f246db</Sha>
5555
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25628.2">
57+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.26122.3">
5858
<Uri>https://github.com/dotnet/cecil</Uri>
59-
<Sha>1f9985e482df7a0dee94854226d0aecad102ac15</Sha>
59+
<Sha>4fe10b2349082f474928ac1b97ce207b70dc2307</Sha>
6060
</Dependency>
6161
<!-- Intermediate is necessary for source build. -->
62-
<Dependency Name="Microsoft.SourceBuild.Intermediate.cecil" Version="0.11.5-alpha.25628.2">
62+
<Dependency Name="Microsoft.SourceBuild.Intermediate.cecil" Version="0.11.5-alpha.26122.3">
6363
<Uri>https://github.com/dotnet/cecil</Uri>
64-
<Sha>1f9985e482df7a0dee94854226d0aecad102ac15</Sha>
64+
<Sha>4fe10b2349082f474928ac1b97ce207b70dc2307</Sha>
6565
<SourceBuild RepoName="cecil" ManagedOnly="true" />
6666
</Dependency>
6767
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.16-servicing.26160.4">
@@ -92,87 +92,87 @@
9292
</Dependency>
9393
</ProductDependencies>
9494
<ToolsetDependencies>
95-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.26070.1">
95+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.26123.3">
9696
<Uri>https://github.com/dotnet/arcade</Uri>
97-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
97+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
9898
</Dependency>
9999
<!-- Intermediate is necessary for source build. -->
100-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.26070.1">
100+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.26123.3">
101101
<Uri>https://github.com/dotnet/arcade</Uri>
102-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
102+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
103103
<SourceBuild RepoName="arcade" ManagedOnly="true" />
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.26070.1">
105+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.26123.3">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
107+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.26070.1">
109+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.26123.3">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
111+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.26070.1">
113+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.26123.3">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
115+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.26070.1">
117+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.26123.3">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
119+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.26070.1">
121+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.26123.3">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
123+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.26070.1">
125+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.26123.3">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
127+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.26070.1">
129+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.26123.3">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
131+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.26070.1">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.26123.3">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
135+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.26070.1">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.26123.3">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
139+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.26070.1">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.26123.3">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
143+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.26070.1">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.26123.3">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
147+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.26070.1">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.26123.3">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
151+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.26070.1">
153+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.26123.3">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
155+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.26070.1">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.26123.3">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
159+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.26070.1">
161+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.26123.3">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
163+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.26070.1">
165+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.26123.3">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
167+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.26070.1">
169+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.26123.3">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
171+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.26070.1">
173+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.26123.3">
174174
<Uri>https://github.com/dotnet/arcade</Uri>
175-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
175+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
176176
</Dependency>
177177
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.25625.4">
178178
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -320,21 +320,21 @@
320320
<Uri>https://github.com/dotnet/runtime</Uri>
321321
<Sha>b030c4dfdfa1bf287f10f96006619a06bc2000ae</Sha>
322322
</Dependency>
323-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.25615.2">
323+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="11.0.0-prerelease.26117.1">
324324
<Uri>https://github.com/dotnet/xharness</Uri>
325-
<Sha>c26361a23526ea459ca0a19b34b285eda1bffecb</Sha>
325+
<Sha>0eeaa60169fe6a95932d29d822e20eb225ce0143</Sha>
326326
</Dependency>
327-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.25615.2">
327+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="11.0.0-prerelease.26117.1">
328328
<Uri>https://github.com/dotnet/xharness</Uri>
329-
<Sha>c26361a23526ea459ca0a19b34b285eda1bffecb</Sha>
329+
<Sha>0eeaa60169fe6a95932d29d822e20eb225ce0143</Sha>
330330
</Dependency>
331-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.25615.2">
331+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="11.0.0-prerelease.26117.1">
332332
<Uri>https://github.com/dotnet/xharness</Uri>
333-
<Sha>c26361a23526ea459ca0a19b34b285eda1bffecb</Sha>
333+
<Sha>0eeaa60169fe6a95932d29d822e20eb225ce0143</Sha>
334334
</Dependency>
335-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.26070.1">
335+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.26123.3">
336336
<Uri>https://github.com/dotnet/arcade</Uri>
337-
<Sha>9b9436a55a49bd58acb8ae95a57ad2185da26805</Sha>
337+
<Sha>29a2184303379b9840b70e7cdb2faa0f39833b89</Sha>
338338
</Dependency>
339339
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
340340
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -352,38 +352,38 @@
352352
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
353353
<Sha>9d7532585ce71e30ab55f0364d3cecccaf0775d1</Sha>
354354
</Dependency>
355-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="9.0.0-alpha.0.25625.4">
355+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="9.0.0-alpha.0.26152.4">
356356
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
357-
<Sha>6eb504148b667c521f41d18dca072f1d2d8eae07</Sha>
357+
<Sha>2a70fdb0e55455dc067a6f24582b5d9ed75ed373</Sha>
358358
</Dependency>
359359
<Dependency Name="System.Runtime.Numerics.TestData" Version="9.0.0-beta.25625.4">
360360
<Uri>https://github.com/dotnet/runtime-assets</Uri>
361361
<Sha>70d5fa7d7d041da17e6f3827f55d7d9ceaffdb12</Sha>
362362
</Dependency>
363-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25569.8">
363+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.26111.11">
364364
<Uri>https://github.com/dotnet/roslyn</Uri>
365-
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
365+
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
366366
</Dependency>
367-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25569.8">
367+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.26111.11">
368368
<Uri>https://github.com/dotnet/roslyn</Uri>
369-
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
369+
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
370370
</Dependency>
371-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25569.8">
371+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.26111.11">
372372
<Uri>https://github.com/dotnet/roslyn</Uri>
373-
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
373+
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
374374
</Dependency>
375-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.26057.1">
376-
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
377-
<Sha>5ef1abb57ce3df89eae65ecadeb1ddbab323ae05</Sha>
375+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.26111.11">
376+
<Uri>https://github.com/dotnet/roslyn</Uri>
377+
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
378378
</Dependency>
379379
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.26057.1">
380380
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
381381
<Sha>5ef1abb57ce3df89eae65ecadeb1ddbab323ae05</Sha>
382382
</Dependency>
383383
<!-- Intermediate is necessary for source build. -->
384-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25569.8">
384+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.26111.11">
385385
<Uri>https://github.com/dotnet/roslyn</Uri>
386-
<Sha>dc344ef24932dcd53cdd24c15364a5996bc6a675</Sha>
386+
<Sha>3fd926df4ab3f93db7c52b21a05ec703736072cf</Sha>
387387
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
388388
</Dependency>
389389
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.109">

0 commit comments

Comments
 (0)