Skip to content

Commit c844b49

Browse files
authored
Merge pull request #109566 from dotnet/merge/release/8.0-to-release/8.0-staging
[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
2 parents 0a843bb + 18ee482 commit c844b49

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

NuGet.config

+1
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-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
1213
<add key="darc-pub-dotnet-emsdk-f623714" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140/nuget/v3/index.json" />
1314
<add key="darc-pub-dotnet-emsdk-f623714-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140-4/nuget/v3/index.json" />
1415
<add key="darc-pub-dotnet-emsdk-f623714-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140-3/nuget/v3/index.json" />

eng/Version.Details.xml

+4-4
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.11">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.12">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>f6237140b33bf18c72dccfeda14be8d103c3b93e</Sha>
95+
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.11-servicing.24511.5">
97+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.12-servicing.24569.2">
9898
<Uri>https://github.com/dotnet/emsdk</Uri>
99-
<Sha>f6237140b33bf18c72dccfeda14be8d103c3b93e</Sha>
99+
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</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.24415.1">

eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<PropertyGroup>
33
<!-- The .NET product branding version -->
4-
<ProductVersion>8.0.11</ProductVersion>
4+
<ProductVersion>8.0.12</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>8</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>11</PatchVersion>
8+
<PatchVersion>12</PatchVersion>
99
<SdkBandVersion>8.0.100</SdkBandVersion>
1010
<PackageVersionNet7>7.0.20</PackageVersionNet7>
1111
<PackageVersionNet6>6.0.36</PackageVersionNet6>
@@ -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.11</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
245+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.12</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
246246
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
247247
<!-- workloads -->
248248
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

0 commit comments

Comments
 (0)