Skip to content

Commit 808851b

Browse files
committed
Merge in 'release/7.0' changes
2 parents 2527cb5 + 3a7f798 commit 808851b

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

NuGet.config

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +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-9506882" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-95068821/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-emsdk-44da825" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-44da825c/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-emsdk-6f67d4a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6f67d4ab/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-942bfc8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-942bfc8c/nuget/v3/index.json" />
1513
<!-- End: Package sources from dotnet-emsdk -->
1614
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1715
<!--

eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
<Uri>https://github.com/dotnet/command-line-api</Uri>
4949
<Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
5050
</Dependency>
51-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.13">
51+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.14">
5252
<Uri>https://github.com/dotnet/emsdk</Uri>
53-
<Sha>44da825cb96e08d28d258c5cda0ba14bbc4f91c3</Sha>
53+
<Sha>942bfc8cb73e3cfea523cb0a2f08b415b2220358</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.13">
55+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.14">
5656
<Uri>https://github.com/dotnet/emsdk</Uri>
57-
<Sha>44da825cb96e08d28d258c5cda0ba14bbc4f91c3</Sha>
57+
<Sha>942bfc8cb73e3cfea523cb0a2f08b415b2220358</Sha>
5858
</Dependency>
5959
</ProductDependencies>
6060
<ToolsetDependencies>

eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
2323
<UsingToolXliff>false</UsingToolXliff>
2424
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
25-
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.13</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
26-
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.13</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
25+
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.14</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
26+
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.14</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
2727
</PropertyGroup>
2828
<ItemGroup>
2929
<!-- The bands we want to produce workload manifests for -->

0 commit comments

Comments
 (0)