未验证 提交 e9175f47 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

[main] Update dependencies from dotnet/runtime dotnet/icu dotnet/xharness...

[main] Update dependencies from dotnet/runtime dotnet/icu dotnet/xharness dotnet/runtime-assets dotnet/emsdk dotnet/roslyn-analyzers (#70476)

* 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 bbb4e156.

* 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: Ndotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: NAlexander Köplinger <alex.koeplinger@outlook.com>
Co-authored-by: NLarry Ewing <lewing@microsoft.com>
Co-authored-by: NAnkit Jain <radical@gmail.com>
上级 df822e75
......@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.22310.1",
"version": "1.0.0-prerelease.22314.1",
"commands": [
"xharness"
]
......
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-preview.6.22306.1">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-preview.6.22313.1">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>7c13e1a1740e54ba0c9b38636ae36195c9e9d3bd</Sha>
<Sha>d18a78f3f7bb973e7b01509ae6afe934cfbbd0d4</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22301.1">
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>b4d67ca60d3f819e2450095ab8a33a9f65513e4a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.6.22281.1">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.6.22313.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>ea10b4e5534de1806cc2e84ddd3b00eabcab962f</Sha>
<Sha>1341deebb8b681c6d3bb6f2f2c8ef81786895ef8</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
<Uri>https://github.com/dotnet/wcf</Uri>
......@@ -130,53 +130,53 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.22281.1">
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22259.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
......@@ -210,49 +210,49 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>54cc196d506692c366d9e116cdb3a9a56342f720</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.6.22305.4">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.6.22312.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
<Sha>a0b426dc781be2f3e38bb13856d15e2fa595a589</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="7.0.0-preview.6.22305.4">
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="7.0.0-preview.6.22312.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
<Sha>a0b426dc781be2f3e38bb13856d15e2fa595a589</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="7.0.0-preview.6.22305.4">
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="7.0.0-preview.6.22312.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
<Sha>a0b426dc781be2f3e38bb13856d15e2fa595a589</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="7.0.0-preview.6.22305.4">
<Dependency Name="runtime.native.System.IO.Ports" Version="7.0.0-preview.6.22312.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
<Sha>a0b426dc781be2f3e38bb13856d15e2fa595a589</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.0-preview.6.22305.4">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.0-preview.6.22312.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
<Sha>a0b426dc781be2f3e38bb13856d15e2fa595a589</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-preview.6.22305.4">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-preview.6.22312.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
<Sha>a0b426dc781be2f3e38bb13856d15e2fa595a589</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="7.0.0-preview.6.22305.4">
<Dependency Name="System.Text.Json" Version="7.0.0-preview.6.22312.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
<Sha>a0b426dc781be2f3e38bb13856d15e2fa595a589</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22308.1">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>978b631362f2ffdccdf63fbe3ffe59dfe985ae3d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22310.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22314.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>43e9fe312ac5513edf763877ce9ebf5d57ca9f88</Sha>
<Sha>5a55841656f09a48df3e6a416b594fef686dd938</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22310.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22314.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>43e9fe312ac5513edf763877ce9ebf5d57ca9f88</Sha>
<Sha>5a55841656f09a48df3e6a416b594fef686dd938</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22310.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22314.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>43e9fe312ac5513edf763877ce9ebf5d57ca9f88</Sha>
<Sha>5a55841656f09a48df3e6a416b594fef686dd938</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22310.1">
<Uri>https://github.com/dotnet/arcade</Uri>
......@@ -278,13 +278,13 @@
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>3c641f5b79f90b0341bc0b6f728bae56ede711fd</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.22313.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>371af1f99788b76eae14b96aad4ab7ac9b373938</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22302.1">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22310.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>114d5f2927b8afc90f169df80fdcbe8c7a644bac</Sha>
<Sha>0e7f40d1709f0d7ffd316d89e452151a7365354b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Compatibility" Version="2.0.0-alpha.1.21525.11">
<Uri>https://github.com/dotnet/sdk</Uri>
......
......@@ -44,7 +44,7 @@
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.3.0-1.22206.2</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.3.0-1.22206.2</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.3.0-1.22206.2</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22302.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22310.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisVersion>4.3.0-1.22206.2</MicrosoftCodeAnalysisVersion>
<!--
TODO: Remove pinned version once arcade supplies a compiler that enables the repo to compile.
......@@ -72,12 +72,12 @@
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-preview.6.22305.4</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreDotNetHostVersion>7.0.0-preview.6.22305.4</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-preview.6.22305.4</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-preview.6.22312.5</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreDotNetHostVersion>7.0.0-preview.6.22312.5</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-preview.6.22312.5</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>7.0.0-preview.6.22305.4</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILAsmVersion>7.0.0-preview.6.22312.5</MicrosoftNETCoreILAsmVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22252.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22252.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22252.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
......@@ -111,25 +111,25 @@
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemServiceModelPrimitivesVersion>4.9.0</SystemServiceModelPrimitivesVersion>
<SystemTextJsonVersion>7.0.0-preview.6.22305.4</SystemTextJsonVersion>
<SystemTextJsonVersion>7.0.0-preview.6.22312.5</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>7.0.0-preview.6.22305.4</runtimenativeSystemIOPortsVersion>
<runtimenativeSystemIOPortsVersion>7.0.0-preview.6.22312.5</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22281.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22281.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>7.0.0-beta.22281.1</SystemDrawingCommonTestDataVersion>
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22313.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22313.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>7.0.0-beta.22313.1</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>7.0.0-beta.22313.1</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>7.0.0-beta.22281.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>7.0.0-beta.22281.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>7.0.0-beta.22281.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22281.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22281.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22281.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.22281.1</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22281.1</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22281.1</MicrosoftDotNetCilStripSourcesVersion>
<SystemIOCompressionTestDataVersion>7.0.0-beta.22313.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>7.0.0-beta.22313.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>7.0.0-beta.22313.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22313.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22313.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22313.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.22313.1</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22313.1</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22313.1</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22279.1</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22279.1</optimizationwindows_ntx86MIBCRuntimeVersion>
......@@ -150,9 +150,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22310.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22310.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22310.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22314.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22314.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22314.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.1.0-alpha.0.22306.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2-pre.22</XUnitVersion>
<XUnitAnalyzersVersion>0.12.0-pre.20</XUnitAnalyzersVersion>
......@@ -171,7 +171,7 @@
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22308.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-preview.6.22306.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-preview.6.22313.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22301.1</SystemNetMsQuicTransportVersion>
<!-- Mono LLVM -->
......@@ -184,7 +184,7 @@
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22259.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22259.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.6.22281.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.6.22313.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
......
......@@ -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"
}
}
......@@ -282,10 +282,10 @@ private string CreateProjectWithNativeReference(string id)
CreateBlazorWasmTemplateProject(id);
string extraItems = @$"
<PackageReference Include=""SkiaSharp"" Version=""2.80.3"" />
<PackageReference Include=""SkiaSharp.NativeAssets.WebAssembly"" Version=""2.80.3"" />
<PackageReference Include=""SkiaSharp"" Version=""2.88.1-preview.63"" />
<PackageReference Include=""SkiaSharp.NativeAssets.WebAssembly"" Version=""2.88.1-preview.63"" />
<NativeFileReference Include=""$(SkiaSharpStaticLibraryPath)\2.0.9\*.a"" />
<NativeFileReference Include=""$(SkiaSharpStaticLibraryPath)\3.1.7\*.a"" />
<WasmFilesToIncludeInFileSystem Include=""{Path.Combine(BuildEnvironment.TestAssetsPath, "mono.png")}"" />
";
string projectFile = Path.Combine(_projectDir!, $"{id}.csproj");
......
......@@ -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";
......
......@@ -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: "<EmccExtraLDFlags>-s ERROR_ON_UNDEFINED_SYMBOLS=0</EmccExtraLDFlags>",
extraItems: @$"
<PackageReference Include=""SkiaSharp"" Version=""2.80.3"" />
<PackageReference Include=""SkiaSharp.NativeAssets.WebAssembly"" Version=""2.80.3"" />
<PackageReference Include=""SkiaSharp"" Version=""2.88.1-preview.63"" />
<PackageReference Include=""SkiaSharp.NativeAssets.WebAssembly"" Version=""2.88.1-preview.63"" />
<NativeFileReference Include=""$(SkiaSharpStaticLibraryPath)\3.1.7\*.a"" />
<NativeFileReference Include=""$(SkiaSharpStaticLibraryPath)\2.0.9\*.a"" />
<WasmFilesToIncludeInFileSystem Include=""{Path.Combine(BuildEnvironment.TestAssetsPath, "mono.png")}"" />
");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册