Skip to content

Commit 95ab6fe

Browse files
[release/8.0] Update dependencies from dotnet/emsdk (#102505)
* 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 <[email protected]>
1 parent 919e5b2 commit 95ab6fe

File tree

4 files changed

+21
-5
lines changed

4 files changed

+21
-5
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +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-a3c7d82" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a3c7d820/nuget/v3/index.json" />
12+
<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" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-sdk -->
1515
<!-- End: Package sources from dotnet-sdk -->

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@
9292
</Dependency>
9393
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.7">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed</Sha>
95+
<Sha>f0463b32eee396d2d1caac58b271d683c7da2333</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.7-servicing.24270.2">
97+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.7-servicing.24277.3">
9898
<Uri>https://github.com/dotnet/emsdk</Uri>
99-
<Sha>a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed</Sha>
99+
<Sha>f0463b32eee396d2d1caac58b271d683c7da2333</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.24257.2">

src/libraries/System.Globalization.Calendars/tests/Hybrid/System.Globalization.Calendars.Hybrid.WASM.Tests.csproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
<TestRuntime>true</TestRuntime>
66
<HybridGlobalization>true</HybridGlobalization>
77
</PropertyGroup>
8+
<PropertyGroup Condition="'$(TargetOS)' == 'browser'">
9+
<!-- This doesn't run on V8 because https://github.com/dotnet/runtime/pull/101671 -->
10+
<Scenario>WasmTestOnBrowser</Scenario>
11+
<TestArchiveTestsRoot>$(TestArchiveRoot)browserornodejs/</TestArchiveTestsRoot>
12+
<TestArchiveTestsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchiveTestsDir>
13+
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
14+
<XunitShowProgress>true</XunitShowProgress>
15+
</PropertyGroup>
816
<ItemGroup>
917
<Compile Include="..\System\Globalization\CalendarTestBase.cs" />
1018
<Compile Include="..\System\Globalization\ChineseLunisolarCalendarTests.cs" />
@@ -106,4 +114,4 @@
106114
<Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarTwoDigitYearMax.cs" />
107115
<Compile Include="$(CommonTestPath)System\RandomDataGenerator.cs" />
108116
</ItemGroup>
109-
</Project>
117+
</Project>

src/libraries/System.Globalization/tests/Hybrid/System.Globalization.Hybrid.WASM.Tests.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
77
<HybridGlobalization>true</HybridGlobalization>
88
</PropertyGroup>
9+
<PropertyGroup Condition="'$(TargetOS)' == 'browser'">
10+
<!-- This doesn't run on V8 because https://github.com/dotnet/runtime/pull/101671 -->
11+
<Scenario>WasmTestOnBrowser</Scenario>
12+
<TestArchiveTestsRoot>$(TestArchiveRoot)browserornodejs/</TestArchiveTestsRoot>
13+
<TestArchiveTestsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/</TestArchiveTestsDir>
14+
<DefineConstants>$(DefineConstants);TARGET_BROWSER</DefineConstants>
15+
<XunitShowProgress>true</XunitShowProgress>
16+
</PropertyGroup>
917
<ItemGroup>
1018
<Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
1119
<Compile Include="..\System\Globalization\TextInfoTests.cs" />

0 commit comments

Comments
 (0)