From e9175f473f97c2632c3e810f4b0811b04ed47cb7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Jun 2022 23:53:03 -0400 Subject: [PATCH] [main] Update dependencies from dotnet/runtime dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/emsdk dotnet/roslyn-analyzers (#70476) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/runtime-assets build 20220608.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.22281.1 -> To Version 7.0.0-beta.22308.1 * Update dependencies from https://github.com/dotnet/emsdk build 20220608.2 Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.0-preview.6.22281.1 -> To Version 7.0.0-preview.6.22308.2 * Update dependencies from https://github.com/dotnet/xharness build 20220610.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22305.1 -> To Version 1.0.0-prerelease.22310.1 * Revert "Update dependencies from https://github.com/dotnet/emsdk build 20220608.2" This reverts commit bbb4e156ddbad8a2cb7b604246214272085b6622. * Update dependencies from https://github.com/dotnet/icu build 20220609.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22309.1 * Update dependencies from https://github.com/dotnet/emsdk build 20220608.2 Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.0-preview.6.22281.1 -> To Version 7.0.0-preview.6.22308.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20220610.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.22281.1 -> To Version 7.0.0-beta.22310.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220610.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.22302.1 -> To Version 7.0.0-preview1.22310.1 * Update dependencies from https://github.com/dotnet/runtime build 20220612.5 Microsoft.NET.Sdk.IL , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHost , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , System.Text.Json From Version 7.0.0-preview.6.22305.4 -> To Version 7.0.0-preview.6.22312.5 * Update dependencies from https://github.com/dotnet/icu build 20220613.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22313.1 * Update dependencies from https://github.com/dotnet/xharness build 20220613.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22310.1 -> To Version 1.0.0-prerelease.22313.1 * Update dependencies from https://github.com/dotnet/runtime-assets build 20220613.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.22281.1 -> To Version 7.0.0-beta.22313.1 * Update dependencies from https://github.com/dotnet/emsdk build 20220613.1 Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.0-preview.6.22281.1 -> To Version 7.0.0-preview.6.22313.1 * [wasm] Wasm.Build.Tests: Disable strict version checks for emcc Due to the way we have to update `dotnet/emsdk`, and get the update PRs in `runtime`, the emsdk version can be mismatched. For example, if `dotnet/emsdk` has already updated to `3.1.12`, but `dotnet/runtime` is still on `3.1.7`. This is an expected scenario while working on updating to a newer emscripten. The version mismatch will still show up, but as a warning now. * Update dependencies from https://github.com/dotnet/xharness build 20220614.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22310.1 -> To Version 1.0.0-prerelease.22314.1 * [wasm] Wasm.Build.Tests: Update Skiasharp reference The skiasharp dependent tests fail with: `error : undefined symbol: _ZNKSt3__220__vector_base_commonILb1EE20__throw_length_errorEv`. Update the reference to the latest package which added a binary compiled for `3.1.7`. * [wasm] Workaround a test failure in WBT Currently, there is a mismatch between emsdk versions with the workload emscripten packs using `3.1.12`, and the runtime being built with `3.1.7`. And that is causing `Wasm.Build.Tests.NativeLibraryTests.ProjectUsingSkiaSharp` to fail with: ``` EXEC : error : undefined symbol: _ZNKSt3__220__vector_base_commonILb1EE20__throw_length_errorEv (referenced by top-level compiled C/C++ code) [/datadisks/disk1/work/B1420981/w/ACC90933/e/blz_nativeref_aot_Debug/blz_nativeref_aot_Debug.csproj] EXEC : warning : Link with `-sLLD_REPORT_UNDEFINED` to get more information on undefined symbols [/datadisks/disk1/work/B1420981/w/ACC90933/e/blz_nativeref_aot_Debug/blz_nativeref_aot_Debug.csproj] EXEC : warning : To disable errors for undefined symbols use `-sERROR_ON_UNDEFINED_SYMBOLS=0` [/datadisks/disk1/work/B1420981/w/ACC90933/e/blz_nativeref_aot_Debug/blz_nativeref_aot_Debug.csproj] EXEC : warning : __ZNKSt3__220__vector_base_commonILb1EE20__throw_length_errorEv may need to be added to EXPORTED_FUNCTIONS if it arrives from a system library [/datadisks/disk1/work/B1420981/w/ACC90933/e/blz_nativeref_aot_Debug/blz_nativeref_aot_Debug.csproj] EXEC : error : undefined symbol: _ZNKSt3__221__basic_string_commonILb1EE20__throw_length_errorEv (referenced by top-level compiled C/C++ code) [/datadisks/disk1/work/B1420981/w/ACC90933/e/blz_nativeref_aot_Debug/blz_nativeref_aot_Debug.csproj] EXEC : warning : __ZNKSt3__221__basic_string_commonILb1EE20__throw_length_errorEv may need to be added to EXPORTED_FUNCTIONS if it arrives from a system library [/datadisks/disk1/work/B1420981/w/ACC90933/e/blz_nativeref_aot_Debug/blz_nativeref_aot_Debug.csproj] EXEC : error : Aborting compilation due to previous errors [/datadisks/disk1/work/B1420981/w/ACC90933/e/blz_nativeref_aot_Debug/blz_nativeref_aot_Debug.csproj] emcc : error : '/datadisks/disk1/work/B1420981/w/ACC90933/e/dotnet-workload/packs/Microsoft.NET.Runtime.Emscripten.3.1.12.Node.linux-x64/7.0.0-preview.6.22313.1/tools/bin/node /datadisks/disk1/work/B1420981/w/ACC90933/e/dotnet-workload/packs/Microsoft.NET.Runtime.Emscripten.3.1.12.Sdk.linux-x64/7.0.0-preview.6.22313.1/tools/emscripten/src/compiler.js /datadisks/disk1/work/B1420981/t/tmp44tn7y2d.json' failed (returned 1) [/datadisks/disk1/work/B1420981/w/ACC90933/e/blz_nativeref_aot_Debug/blz_nativeref_aot_Debug.csproj] ``` This commit adds a temporary workaround to ignore the undefined symbols for this specific test. And this should be removed when runtime is updated to `3.1.12` . Co-authored-by: dotnet-maestro[bot] Co-authored-by: Alexander Köplinger Co-authored-by: Larry Ewing Co-authored-by: Ankit Jain --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 100 +++++++++--------- eng/Versions.props | 48 ++++----- global.json | 2 +- .../BlazorWasmBuildPublishTests.cs | 6 +- .../Wasm.Build.Tests/BuildEnvironment.cs | 1 - .../Wasm.Build.Tests/NativeLibraryTests.cs | 9 +- 7 files changed, 85 insertions(+), 83 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8ae6cf1f84e..aa50cafc89e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22310.1", + "version": "1.0.0-prerelease.22314.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92accd2d964..3c0a0f7cf0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/icu - 7c13e1a1740e54ba0c9b38636ae36195c9e9d3bd + d18a78f3f7bb973e7b01509ae6afe934cfbbd0d4 https://github.com/dotnet/msquic b4d67ca60d3f819e2450095ab8a33a9f65513e4a - + https://github.com/dotnet/emsdk - ea10b4e5534de1806cc2e84ddd3b00eabcab962f + 1341deebb8b681c6d3bb6f2f2c8ef81786895ef8 https://github.com/dotnet/wcf @@ -130,53 +130,53 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 https://github.com/dotnet/runtime-assets 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 https://github.com/dotnet/llvm-project @@ -210,49 +210,49 @@ https://github.com/dotnet/llvm-project 54cc196d506692c366d9e116cdb3a9a56342f720 - + https://github.com/dotnet/runtime - f21ace52e357bbf0019da5c9e42d66705a087235 + a0b426dc781be2f3e38bb13856d15e2fa595a589 - + https://github.com/dotnet/runtime - f21ace52e357bbf0019da5c9e42d66705a087235 + a0b426dc781be2f3e38bb13856d15e2fa595a589 - + https://github.com/dotnet/runtime - f21ace52e357bbf0019da5c9e42d66705a087235 + a0b426dc781be2f3e38bb13856d15e2fa595a589 - + https://github.com/dotnet/runtime - f21ace52e357bbf0019da5c9e42d66705a087235 + a0b426dc781be2f3e38bb13856d15e2fa595a589 - + https://github.com/dotnet/runtime - f21ace52e357bbf0019da5c9e42d66705a087235 + a0b426dc781be2f3e38bb13856d15e2fa595a589 - + https://github.com/dotnet/runtime - f21ace52e357bbf0019da5c9e42d66705a087235 + a0b426dc781be2f3e38bb13856d15e2fa595a589 - + https://github.com/dotnet/runtime - f21ace52e357bbf0019da5c9e42d66705a087235 + a0b426dc781be2f3e38bb13856d15e2fa595a589 https://github.com/dotnet/linker 978b631362f2ffdccdf63fbe3ffe59dfe985ae3d - + https://github.com/dotnet/xharness - 43e9fe312ac5513edf763877ce9ebf5d57ca9f88 + 5a55841656f09a48df3e6a416b594fef686dd938 - + https://github.com/dotnet/xharness - 43e9fe312ac5513edf763877ce9ebf5d57ca9f88 + 5a55841656f09a48df3e6a416b594fef686dd938 - + https://github.com/dotnet/xharness - 43e9fe312ac5513edf763877ce9ebf5d57ca9f88 + 5a55841656f09a48df3e6a416b594fef686dd938 https://github.com/dotnet/arcade @@ -278,13 +278,13 @@ https://github.com/dotnet/hotreload-utils 3c641f5b79f90b0341bc0b6f728bae56ede711fd - + https://github.com/dotnet/runtime-assets - 0920468fa7db4ee8ea8bbcba186421cb92713adf + 371af1f99788b76eae14b96aad4ab7ac9b373938 - + https://github.com/dotnet/roslyn-analyzers - 114d5f2927b8afc90f169df80fdcbe8c7a644bac + 0e7f40d1709f0d7ffd316d89e452151a7365354b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 479b25b1591..c69631e4a06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ 4.3.0-1.22206.2 4.3.0-1.22206.2 4.3.0-1.22206.2 - 7.0.0-preview1.22302.1 + 7.0.0-preview1.22310.1 4.3.0-1.22206.2 6.0.0-preview.1.102 - 7.0.0-preview.6.22305.4 - 7.0.0-preview.6.22305.4 - 7.0.0-preview.6.22305.4 + 7.0.0-preview.6.22312.5 + 7.0.0-preview.6.22312.5 + 7.0.0-preview.6.22312.5 3.1.0 - 7.0.0-preview.6.22305.4 + 7.0.0-preview.6.22312.5 1.0.0-alpha.1.22252.1 1.0.0-alpha.1.22252.1 1.0.0-alpha.1.22252.1 @@ -111,25 +111,25 @@ 5.0.0 5.0.0 4.9.0 - 7.0.0-preview.6.22305.4 + 7.0.0-preview.6.22312.5 6.0.0 4.5.4 4.5.0 - 7.0.0-preview.6.22305.4 + 7.0.0-preview.6.22312.5 - 7.0.0-beta.22281.1 - 7.0.0-beta.22281.1 - 7.0.0-beta.22281.1 + 7.0.0-beta.22313.1 + 7.0.0-beta.22313.1 + 7.0.0-beta.22313.1 7.0.0-beta.22313.1 - 7.0.0-beta.22281.1 - 7.0.0-beta.22281.1 - 7.0.0-beta.22281.1 - 7.0.0-beta.22281.1 - 7.0.0-beta.22281.1 - 7.0.0-beta.22281.1 - 7.0.0-beta.22281.1 - 7.0.0-beta.22281.1 - 7.0.0-beta.22281.1 + 7.0.0-beta.22313.1 + 7.0.0-beta.22313.1 + 7.0.0-beta.22313.1 + 7.0.0-beta.22313.1 + 7.0.0-beta.22313.1 + 7.0.0-beta.22313.1 + 7.0.0-beta.22313.1 + 7.0.0-beta.22313.1 + 7.0.0-beta.22313.1 1.0.0-prerelease.22279.1 1.0.0-prerelease.22279.1 @@ -150,9 +150,9 @@ 1.1.0 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22310.1 - 1.0.0-prerelease.22310.1 - 1.0.0-prerelease.22310.1 + 1.0.0-prerelease.22314.1 + 1.0.0-prerelease.22314.1 + 1.0.0-prerelease.22314.1 1.1.0-alpha.0.22306.2 2.4.2-pre.22 0.12.0-pre.20 @@ -171,7 +171,7 @@ 7.0.100-1.22308.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-preview.6.22306.1 + 7.0.0-preview.6.22313.1 7.0.0-alpha.1.22301.1 @@ -184,7 +184,7 @@ 11.1.0-alpha.1.22259.2 11.1.0-alpha.1.22259.2 - 7.0.0-preview.6.22281.1 + 7.0.0-preview.6.22313.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda diff --git a/global.json b/global.json index 18394813d74..6af93a69e34 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22310.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", - "Microsoft.NET.Sdk.IL": "7.0.0-preview.6.22305.4" + "Microsoft.NET.Sdk.IL": "7.0.0-preview.6.22312.5" } } diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs index 60ae583f76d..34eb4674602 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs @@ -282,10 +282,10 @@ private string CreateProjectWithNativeReference(string id) CreateBlazorWasmTemplateProject(id); string extraItems = @$" - - + + - + "; string projectFile = Path.Combine(_projectDir!, $"{id}.csproj"); diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs index 73465e8c009..16c9e2e7fd0 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs @@ -94,7 +94,6 @@ public BuildEnvironment() EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath; EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0"; EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; - EnvVars["_WasmStrictVersionMatch"] = "true"; EnvVars["MSBuildSDKsPath"] = string.Empty; EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}"; EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1"; diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs index e3e013b55f4..809ccee6d6b 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs @@ -56,11 +56,14 @@ public void ProjectUsingSkiaSharp(BuildArgs buildArgs, RunHost host, string id) string projectName = $"AppUsingSkiaSharp"; buildArgs = buildArgs with { ProjectName = projectName }; buildArgs = ExpandBuildArgs(buildArgs, + // FIXME: temporary, till `main` is either completely on 3.1.7, or 3.1.12 + extraProperties: "-s ERROR_ON_UNDEFINED_SYMBOLS=0", extraItems: @$" - - + + + + - "); -- GitLab