Skip to content

Commit c299641

Browse files
authored
Merge pull request #113449 from dotnet/merge/release/9.0-to-release/9.0-staging
[automated] Merge branch 'release/9.0' => 'release/9.0-staging'
2 parents f4197ea + a7cb7e1 commit c299641

File tree

4 files changed

+81
-73
lines changed

4 files changed

+81
-73
lines changed

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12+
<add key="darc-pub-dotnet-emsdk-b8d8fec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b8d8fec8/nuget/v3/index.json" />
1213
<add key="darc-pub-dotnet-emsdk-78be8cd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf/nuget/v3/index.json" />
1314
<add key="darc-pub-dotnet-emsdk-78be8cd-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf-2/nuget/v3/index.json" />
1415
<add key="darc-pub-dotnet-emsdk-78be8cd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf-1/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,37 @@
1212
<Uri>https://github.com/dotnet/wcf</Uri>
1313
<Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha>
1414
</Dependency>
15-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
15+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
1616
<Uri>https://github.com/dotnet/llvm-project</Uri>
17-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
17+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
1818
</Dependency>
19-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
19+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
2020
<Uri>https://github.com/dotnet/llvm-project</Uri>
21-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
21+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
2222
</Dependency>
23-
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
23+
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
2424
<Uri>https://github.com/dotnet/llvm-project</Uri>
25-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
25+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
2626
</Dependency>
27-
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
27+
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
2828
<Uri>https://github.com/dotnet/llvm-project</Uri>
29-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
29+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
31+
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
3232
<Uri>https://github.com/dotnet/llvm-project</Uri>
33-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
33+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
35+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
3636
<Uri>https://github.com/dotnet/llvm-project</Uri>
37-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
37+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
3838
</Dependency>
39-
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
39+
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
4040
<Uri>https://github.com/dotnet/llvm-project</Uri>
41-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
41+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
4242
</Dependency>
43-
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
43+
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
4444
<Uri>https://github.com/dotnet/llvm-project</Uri>
45-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
45+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
4646
</Dependency>
4747
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24324.3">
4848
<Uri>https://github.com/dotnet/command-line-api</Uri>
@@ -64,18 +64,18 @@
6464
<Sha>e9c26dfe3cdc9cafe5acd2bb9aa1fa1b4cbcc72f</Sha>
6565
<SourceBuild RepoName="cecil" ManagedOnly="true" />
6666
</Dependency>
67-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.4-servicing.25157.2">
67+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.4-servicing.25177.1">
6868
<Uri>https://github.com/dotnet/emsdk</Uri>
69-
<Sha>78be8cdf4f0bfd93018fd7a87f8282a41d041298</Sha>
69+
<Sha>b8d8fec81291264a825ba4c803ad50577b9d2265</Sha>
7070
</Dependency>
7171
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.4">
7272
<Uri>https://github.com/dotnet/emsdk</Uri>
73-
<Sha>78be8cdf4f0bfd93018fd7a87f8282a41d041298</Sha>
73+
<Sha>b8d8fec81291264a825ba4c803ad50577b9d2265</Sha>
7474
</Dependency>
7575
<!-- Intermediate is necessary for source build. -->
76-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.4-servicing.25157.2">
76+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.4-servicing.25177.1">
7777
<Uri>https://github.com/dotnet/emsdk</Uri>
78-
<Sha>78be8cdf4f0bfd93018fd7a87f8282a41d041298</Sha>
78+
<Sha>b8d8fec81291264a825ba4c803ad50577b9d2265</Sha>
7979
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
8080
</Dependency>
8181
<!-- Intermediate is necessary for source build. -->
@@ -226,61 +226,61 @@
226226
<Uri>https://github.com/dotnet/runtime-assets</Uri>
227227
<Sha>aedfa03dd61c8e5ef1253d33a245d884669b0476</Sha>
228228
</Dependency>
229-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
229+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
230230
<Uri>https://github.com/dotnet/llvm-project</Uri>
231-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
231+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
232232
</Dependency>
233-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
233+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
234234
<Uri>https://github.com/dotnet/llvm-project</Uri>
235-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
235+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
236236
</Dependency>
237-
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
237+
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
238238
<Uri>https://github.com/dotnet/llvm-project</Uri>
239-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
239+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
240240
</Dependency>
241-
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
241+
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
242242
<Uri>https://github.com/dotnet/llvm-project</Uri>
243-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
243+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
244244
</Dependency>
245-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
245+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
246246
<Uri>https://github.com/dotnet/llvm-project</Uri>
247-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
247+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
248248
</Dependency>
249-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
249+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
250250
<Uri>https://github.com/dotnet/llvm-project</Uri>
251-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
251+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
252252
</Dependency>
253-
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
253+
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
254254
<Uri>https://github.com/dotnet/llvm-project</Uri>
255-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
255+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
256256
</Dependency>
257-
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
257+
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
258258
<Uri>https://github.com/dotnet/llvm-project</Uri>
259-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
259+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
260260
</Dependency>
261-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
261+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
262262
<Uri>https://github.com/dotnet/llvm-project</Uri>
263-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
263+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
264264
</Dependency>
265-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
265+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
266266
<Uri>https://github.com/dotnet/llvm-project</Uri>
267-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
267+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
268268
</Dependency>
269-
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
269+
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
270270
<Uri>https://github.com/dotnet/llvm-project</Uri>
271-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
271+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
272272
</Dependency>
273-
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
273+
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
274274
<Uri>https://github.com/dotnet/llvm-project</Uri>
275-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
275+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
276276
</Dependency>
277-
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
277+
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
278278
<Uri>https://github.com/dotnet/llvm-project</Uri>
279-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
279+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
280280
</Dependency>
281-
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25113.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
281+
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="19.1.0-alpha.1.25163.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
282282
<Uri>https://github.com/dotnet/llvm-project</Uri>
283-
<Sha>f98a0db595fe3f28dac4594acc7114b16281d090</Sha>
283+
<Sha>158c0c35f7a4ca5b2214cb259ba581396458c502</Sha>
284284
</Dependency>
285285
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24511.16">
286286
<Uri>https://github.com/dotnet/runtime</Uri>

0 commit comments

Comments
 (0)