Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b096e5b
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Jun 9, 2022
bbb4e15
Update dependencies from https://github.com/dotnet/emsdk build 202206…
dotnet-maestro[bot] Jun 9, 2022
082f5fe
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Jun 10, 2022
c9bcc40
Revert "Update dependencies from https://github.com/dotnet/emsdk buil…
akoeplinger Jun 10, 2022
4705a99
Update dependencies from https://github.com/dotnet/icu build 20220609.1
dotnet-maestro[bot] Jun 10, 2022
b9b0602
Update dependencies from https://github.com/dotnet/emsdk build 202206…
dotnet-maestro[bot] Jun 10, 2022
f875f36
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Jun 11, 2022
7fef0c6
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Jun 11, 2022
247b33f
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jun 13, 2022
3818559
Update dependencies from https://github.com/dotnet/icu build 20220613.1
dotnet-maestro[bot] Jun 14, 2022
2b4fec3
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Jun 14, 2022
3a04ee9
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Jun 14, 2022
4fcda03
Update dependencies from https://github.com/dotnet/emsdk build 202206…
dotnet-maestro[bot] Jun 14, 2022
dfc4919
Merge branch 'main' into darc-main-db11f0fe-f444-4c3c-9935-42531128e662
lewing Jun 14, 2022
4fabee9
[wasm] Wasm.Build.Tests: Disable strict version checks for emcc
radical Jun 14, 2022
d11585f
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Jun 15, 2022
b1bac18
[wasm] Wasm.Build.Tests: Update Skiasharp reference
radical Jun 17, 2022
dd8e85a
[wasm] Workaround a test failure in WBT
radical Jun 17, 2022
42761f3
Merge branch 'main' into darc-main-db11f0fe-f444-4c3c-9935-42531128e662
radical Jun 17, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.22305.1",
"version": "1.0.0-prerelease.22310.1",
"commands": [
"xharness"
]
Expand Down
68 changes: 34 additions & 34 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<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.22308.2">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>ea10b4e5534de1806cc2e84ddd3b00eabcab962f</Sha>
<Sha>0f2e17824c967a9d5fef01463c51585c875d9136</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
<Uri>https://github.com/dotnet/wcf</Uri>
Expand Down Expand Up @@ -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.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</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.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</Sha>
</Dependency>
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</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.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</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.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</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.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.22281.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</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.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</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.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</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.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</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.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</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>
Expand Down Expand Up @@ -242,17 +242,17 @@
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>1481a51970586b26208a7bc6173dc77d658f3508</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22305.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22310.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>a1d9a67e971fc0b8724507847491fe93f65728db</Sha>
<Sha>43e9fe312ac5513edf763877ce9ebf5d57ca9f88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22305.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22310.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>a1d9a67e971fc0b8724507847491fe93f65728db</Sha>
<Sha>43e9fe312ac5513edf763877ce9ebf5d57ca9f88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22305.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22310.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>a1d9a67e971fc0b8724507847491fe93f65728db</Sha>
<Sha>43e9fe312ac5513edf763877ce9ebf5d57ca9f88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22255.2">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -278,9 +278,9 @@
<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.22308.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
<Sha>6cd6fc07ca203e3e2bb8f79d8345e55b035b7964</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22302.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
34 changes: 17 additions & 17 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,19 @@
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>7.0.0-preview.6.22305.4</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>
<SystemFormatsTarTestDataVersion>7.0.0-beta.22281.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>
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22308.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22308.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>7.0.0-beta.22308.1</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>7.0.0-beta.22308.1</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>7.0.0-beta.22308.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>7.0.0-beta.22308.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>7.0.0-beta.22308.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22308.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22308.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22308.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.22308.1</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22308.1</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22308.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>
Expand All @@ -150,9 +150,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22305.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22305.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22305.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22310.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22310.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22310.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>
Expand Down Expand Up @@ -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.22308.2</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down