Skip to content

Commit ffddc54

Browse files
authored
Merge branch 'release/8.0' into release/8.0-staging
2 parents 165b4c9 + 36d276b commit ffddc54

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
1212
<add key="darc-pub-dotnet-emsdk-ec84e77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-6afd7b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6afd7b9f/nuget/v3/index.json" />
1314
<!-- End: Package sources from dotnet-emsdk -->
1415
<!-- Begin: Package sources from dotnet-sdk -->
1516
<!-- End: Package sources from dotnet-sdk -->

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@
9090
<Sha>45dd3a73dd5b64b010c4251303b3664bb30df029</Sha>
9191
<SourceBuild RepoName="cecil" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.14">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.15">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
95+
<Sha>6afd7b9f34943078f2e3b747f33350e5fe114269</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.14-servicing.25105.1">
97+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.15-servicing.25157.1">
9898
<Uri>https://github.com/dotnet/emsdk</Uri>
99-
<Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
99+
<Sha>6afd7b9f34943078f2e3b747f33350e5fe114269</Sha>
100100
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
101101
</Dependency>
102102
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
243243
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
244244
-->
245-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.14</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
245+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.15</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
246246
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
247247
<!-- workloads -->
248248
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

0 commit comments

Comments
 (0)