Skip to content

Commit

Permalink
[release/8.0] Update dependencies from dotnet/emsdk (#102505)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/emsdk build 20240521.1

Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.7-servicing.24270.2 -> To Version 8.0.7-servicing.24271.1

* Block v8, same as on net8-staging and net9 branches.

* Update dependencies from https://github.com/dotnet/emsdk build 20240527.3

Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.7-servicing.24270.2 -> To Version 8.0.7-servicing.24277.3

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Ilona Tomkowicz <itomkowicz@microsoft.com>
  • Loading branch information
3 people committed Jun 10, 2024
1 parent 919e5b2 commit 95ab6fe
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-a3c7d82" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a3c7d820/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-f0463b3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f0463b32/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-sdk -->
<!-- End: Package sources from dotnet-sdk -->
Expand Down
6 changes: 3 additions & 3 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.7">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed</Sha>
<Sha>f0463b32eee396d2d1caac58b271d683c7da2333</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.7-servicing.24270.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.7-servicing.24277.3">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed</Sha>
<Sha>f0463b32eee396d2d1caac58b271d683c7da2333</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24257.2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
<TestRuntime>true</TestRuntime>
<HybridGlobalization>true</HybridGlobalization>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetOS)' == 'browser'">
<!-- This doesn't run on V8 because https://github.com/dotnet/runtime/pull/101671 -->
<Scenario>WasmTestOnBrowser</Scenario>
<TestArchiveTestsRoot>$(TestArchiveRoot)browserornodejs/</TestArchiveTestsRoot>
<TestArchiveTestsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchiveTestsDir>
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
<XunitShowProgress>true</XunitShowProgress>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\System\Globalization\CalendarTestBase.cs" />
<Compile Include="..\System\Globalization\ChineseLunisolarCalendarTests.cs" />
Expand Down Expand Up @@ -106,4 +114,4 @@
<Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarTwoDigitYearMax.cs" />
<Compile Include="$(CommonTestPath)System\RandomDataGenerator.cs" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<HybridGlobalization>true</HybridGlobalization>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetOS)' == 'browser'">
<!-- This doesn't run on V8 because https://github.com/dotnet/runtime/pull/101671 -->
<Scenario>WasmTestOnBrowser</Scenario>
<TestArchiveTestsRoot>$(TestArchiveRoot)browserornodejs/</TestArchiveTestsRoot>
<TestArchiveTestsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchiveTestsDir>
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
<XunitShowProgress>true</XunitShowProgress>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
<Compile Include="..\System\Globalization\TextInfoTests.cs" />
Expand Down

0 comments on commit 95ab6fe

Please sign in to comment.