Skip to content

Commit d1e584d

Browse files
mmitchelewing
mmitche
and
lewing
authored
Tie llvm to emsdk's version (#89865)
* Tie llvm to emsdk's version This avoids incoherency that will cause the .NET build drop to be too large to fit on the staging pipeline disk. * Update to latest emsdk flow --------- Co-authored-by: Larry Ewing <[email protected]>
1 parent 9d3c822 commit d1e584d

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

‎eng/Version.Details.xml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,67 +12,67 @@
1212
<Uri>https://github.com/dotnet/wcf</Uri>
1313
<Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha>
1414
</Dependency>
15-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4">
15+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
1616
<Uri>https://github.com/dotnet/llvm-project</Uri>
1717
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
1818
</Dependency>
19-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4">
19+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
2020
<Uri>https://github.com/dotnet/llvm-project</Uri>
2121
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
2222
</Dependency>
23-
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4">
23+
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
2424
<Uri>https://github.com/dotnet/llvm-project</Uri>
2525
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
2626
</Dependency>
27-
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4">
27+
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
2828
<Uri>https://github.com/dotnet/llvm-project</Uri>
2929
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4">
31+
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
3232
<Uri>https://github.com/dotnet/llvm-project</Uri>
3333
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4">
35+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
3636
<Uri>https://github.com/dotnet/llvm-project</Uri>
3737
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
3838
</Dependency>
39-
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4">
39+
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
4040
<Uri>https://github.com/dotnet/llvm-project</Uri>
4141
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
4242
</Dependency>
43-
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4">
43+
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
4444
<Uri>https://github.com/dotnet/llvm-project</Uri>
4545
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
4646
</Dependency>
47-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4">
47+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
4848
<Uri>https://github.com/dotnet/llvm-project</Uri>
4949
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
5050
</Dependency>
51-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4">
51+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
5252
<Uri>https://github.com/dotnet/llvm-project</Uri>
5353
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
5454
</Dependency>
55-
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4">
55+
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
5656
<Uri>https://github.com/dotnet/llvm-project</Uri>
5757
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
5858
</Dependency>
59-
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4">
59+
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
6060
<Uri>https://github.com/dotnet/llvm-project</Uri>
6161
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
6262
</Dependency>
63-
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4">
63+
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
6464
<Uri>https://github.com/dotnet/llvm-project</Uri>
6565
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
6666
</Dependency>
67-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4">
67+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
6868
<Uri>https://github.com/dotnet/llvm-project</Uri>
6969
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
7070
</Dependency>
71-
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4">
71+
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
7272
<Uri>https://github.com/dotnet/llvm-project</Uri>
7373
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
7474
</Dependency>
75-
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4">
75+
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
7676
<Uri>https://github.com/dotnet/llvm-project</Uri>
7777
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
7878
</Dependency>
@@ -90,9 +90,9 @@
9090
<Sha>a6181f7751932da21fd2e22b2b26f44f913f2da7</Sha>
9191
<SourceBuild RepoName="cecil" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23401.2">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23402.1">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>29f305909d4960cdba56195ae28693ff38aad812</Sha>
95+
<Sha>d97cdfef48a236337b06ea5c54baab9e7a4bfd8e</Sha>
9696
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
9797
</Dependency>
9898
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23266.3">
@@ -233,59 +233,59 @@
233233
<Uri>https://github.com/dotnet/runtime-assets</Uri>
234234
<Sha>f3a59688fedc19844c670f4d46d7c21ef55cf1f8</Sha>
235235
</Dependency>
236-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4">
236+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
237237
<Uri>https://github.com/dotnet/llvm-project</Uri>
238238
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
239239
</Dependency>
240-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4">
240+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
241241
<Uri>https://github.com/dotnet/llvm-project</Uri>
242242
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
243243
</Dependency>
244-
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4">
244+
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
245245
<Uri>https://github.com/dotnet/llvm-project</Uri>
246246
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
247247
</Dependency>
248-
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4">
248+
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
249249
<Uri>https://github.com/dotnet/llvm-project</Uri>
250250
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
251251
</Dependency>
252-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4">
252+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
253253
<Uri>https://github.com/dotnet/llvm-project</Uri>
254254
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
255255
</Dependency>
256-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4">
256+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
257257
<Uri>https://github.com/dotnet/llvm-project</Uri>
258258
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
259259
</Dependency>
260-
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4">
260+
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
261261
<Uri>https://github.com/dotnet/llvm-project</Uri>
262262
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
263263
</Dependency>
264-
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4">
264+
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
265265
<Uri>https://github.com/dotnet/llvm-project</Uri>
266266
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
267267
</Dependency>
268-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4">
268+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
269269
<Uri>https://github.com/dotnet/llvm-project</Uri>
270270
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
271271
</Dependency>
272-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4">
272+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
273273
<Uri>https://github.com/dotnet/llvm-project</Uri>
274274
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
275275
</Dependency>
276-
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4">
276+
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
277277
<Uri>https://github.com/dotnet/llvm-project</Uri>
278278
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
279279
</Dependency>
280-
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4">
280+
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
281281
<Uri>https://github.com/dotnet/llvm-project</Uri>
282282
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
283283
</Dependency>
284-
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4">
284+
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
285285
<Uri>https://github.com/dotnet/llvm-project</Uri>
286286
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
287287
</Dependency>
288-
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4">
288+
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="16.0.5-alpha.1.23401.4" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport">
289289
<Uri>https://github.com/dotnet/llvm-project</Uri>
290290
<Sha>da8189885069c59206b903f1b73c240cd9326327</Sha>
291291
</Dependency>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
239239
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
240240
-->
241-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.1.23401.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
241+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.1.23402.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
242242
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
243243
<!-- workloads -->
244244
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

0 commit comments

Comments
 (0)