Skip to content

Commit 156aa8a

Browse files
committed
Merge in 'release/7.0' changes
2 parents 6dad548 + eeabb53 commit 156aa8a

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

NuGet.config

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
</fallbackPackageFolders>
88
<packageSources>
99
<clear />
10+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
11+
<!-- Begin: Package sources from dotnet-emsdk -->
12+
<add key="darc-pub-dotnet-emsdk-6b7d1f4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47/nuget/v3/index.json" />
13+
<!-- End: Package sources from dotnet-emsdk -->
14+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1015
<!--
1116
'src/test/PrepareTestAssets/PrepareTestAssets.proj' generates a NuGet.config file using this
1217
one as a template. The following line is a marker to insert the test restore sources.

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.0-rtm.22504.3">
51+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0">
5252
<Uri>https://github.com/dotnet/emsdk</Uri>
53-
<Sha>daca2015ce74956591df9c9dc7ee732af7863b42</Sha>
53+
<Sha>6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rtm.22504.3">
55+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0">
5656
<Uri>https://github.com/dotnet/emsdk</Uri>
57-
<Sha>daca2015ce74956591df9c9dc7ee732af7863b42</Sha>
57+
<Sha>6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31</Sha>
5858
</Dependency>
5959
</ProductDependencies>
6060
<ToolsetDependencies>

eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<UsingToolXliff>false</UsingToolXliff>
2424
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
2525
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
26-
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.0-rtm.22504.3</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
27-
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rtm.22504.3</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
26+
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.0</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
27+
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
2828
</PropertyGroup>
2929
<!--
3030
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.

0 commit comments

Comments
 (0)