Skip to content

Commit a6dbb80

Browse files
committed
Merge in 'release/7.0' changes
2 parents dfb685a + 4bc0fe9 commit a6dbb80

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

NuGet.config

Lines changed: 1 addition & 3 deletions
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-9b227c1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9b227c16/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-emsdk-9b227c1-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9b227c16-2/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-emsdk-9b227c1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9b227c16-1/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-96ba1fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed/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

Lines changed: 4 additions & 4 deletions
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.9">
51+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.10">
5252
<Uri>https://github.com/dotnet/emsdk</Uri>
53-
<Sha>9b227c1606a01920839873f840f6b76f7b492a66</Sha>
53+
<Sha>96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.9">
55+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.10">
5656
<Uri>https://github.com/dotnet/emsdk</Uri>
57-
<Sha>9b227c1606a01920839873f840f6b76f7b492a66</Sha>
57+
<Sha>96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d</Sha>
5858
</Dependency>
5959
</ProductDependencies>
6060
<ToolsetDependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
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.9</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
26-
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.9</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
25+
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.10</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
26+
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.10</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
2727
</PropertyGroup>
2828
<ItemGroup>
2929
<!-- The bands we want to produce workload manifests for -->

0 commit comments

Comments
 (0)