Skip to content

Commit ef6f5ce

Browse files
committed
Merged PR 44319: Update to the 6.0.36 emsdk build
- Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Update to the 6.0.36 emsdk build ---- #### AI description (iteration 1) #### PR Classification Dependency update #### PR Summary This pull request updates the Emscripten SDK to version 6.0.36 and modifies related package configurations. - `NuGet.config`: Updated package sources for `dotnet-emsdk` and added new sources for `dotnet-windowsdesktop`. - `eng/Version.Details.xml`: Updated the version and SHA for `Microsoft.NET.Workload.Emscripten.Manifest-6.0.400`. - `eng/Versions.props`: Updated the `MicrosoftNETWorkloadEmscriptenManifest60400Version` to 6.0.36.
1 parent 6d07e57 commit ef6f5ce

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

NuGet.config

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
<add key="darc-int-dotnet-aspnetcore-64ea410" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-64ea4108/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-aspnetcore -->
1212
<!-- Begin: Package sources from dotnet-emsdk -->
13-
<add key="darc-pub-dotnet-emsdk-c68eace" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-emsdk-c68eace-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-3/nuget/v3/index.json" />
15-
<add key="darc-pub-dotnet-emsdk-c68eace-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-2/nuget/v3/index.json" />
16-
<add key="darc-pub-dotnet-emsdk-c68eace-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-1/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-d440134" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d440134a/nuget/v3/index.json" />
1714
<!-- End: Package sources from dotnet-emsdk -->
1815
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1916
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
@@ -22,10 +19,12 @@
2219
<add key="darc-int-dotnet-runtime-f1dd571" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f1dd5716/nuget/v3/index.json" />
2320
<!-- End: Package sources from dotnet-runtime -->
2421
<!-- Begin: Package sources from dotnet-templating -->
25-
<add key="darc-int-dotnet-templating-7a8644f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7a8644f1/nuget/v3/index.json" />
2622
<!-- End: Package sources from dotnet-templating -->
2723
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2824
<add key="darc-int-dotnet-windowsdesktop-320a638" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-320a638d/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-windowsdesktop-320a638-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-320a638d-3/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-windowsdesktop-320a638-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-320a638d-2/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-windowsdesktop-320a638-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-320a638d-1/nuget/v3/index.json" />
2928
<!-- End: Package sources from dotnet-windowsdesktop -->
3029
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3130
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -52,9 +51,11 @@
5251
<add key="darc-int-dotnet-runtime-f1dd571" value="true" />
5352
<!-- End: Package sources from dotnet-runtime -->
5453
<!-- Begin: Package sources from dotnet-templating -->
55-
<add key="darc-int-dotnet-templating-7a8644f" value="true" />
5654
<!-- End: Package sources from dotnet-templating -->
5755
<!-- Begin: Package sources from dotnet-windowsdesktop -->
56+
<add key="darc-int-dotnet-windowsdesktop-320a638-1" value="true" />
57+
<add key="darc-int-dotnet-windowsdesktop-320a638-2" value="true" />
58+
<add key="darc-int-dotnet-windowsdesktop-320a638-3" value="true" />
5859
<add key="darc-int-dotnet-windowsdesktop-320a638" value="true" />
5960
<!-- End: Package sources from dotnet-windowsdesktop -->
6061
<!-- Begin: Package sources from dotnet-windowsdesktop -->

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@
166166
<Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
167167
<SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
168168
</Dependency>
169-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.35" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
169+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.36">
170170
<Uri>https://github.com/dotnet/emsdk</Uri>
171-
<Sha>c68eace1f3c11ab25cdf30a425ab3792773bb2cc</Sha>
171+
<Sha>d440134ad1037c7a3c91c78fff964078f240e08c</Sha>
172172
</Dependency>
173173
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21519.2" CoherentParentDependency="Microsoft.NET.Sdk">
174174
<Uri>https://github.com/dotnet/source-build</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
<XamarinMacOSWorkloadManifestVersion>12.3.303</XamarinMacOSWorkloadManifestVersion>
157157
<XamarinTvOSWorkloadManifestVersion>15.4.303</XamarinTvOSWorkloadManifestVersion>
158158
<MonoWorkloadManifestVersion>6.0.5</MonoWorkloadManifestVersion>
159-
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.35</MicrosoftNETWorkloadEmscriptenManifest60400Version>
159+
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.36</MicrosoftNETWorkloadEmscriptenManifest60400Version>
160160
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest60400Version)</EmscriptenWorkloadManifestVersion>
161161
</PropertyGroup>
162162
<PropertyGroup>

0 commit comments

Comments
 (0)