From b40d64308c34a86ad25574a0a2cb20fcd333235a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 14:03:28 -0500 Subject: [PATCH] [main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/emsdk (#88827) * Update dependencies from https://github.com/dotnet/arcade build 20230712.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23361.1 -> To Version 8.0.0-beta.23362.5 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 8.0.0-beta.23360.2 -> To Version 8.0.0-beta.23361.2 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/emsdk build 20230712.1 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.7.23361.2 -> To Version 8.0.0-preview.7.23362.1 * Update Tools.props * Update Version.Details.xml * Suppress warning in test * Workaround for https://github.com/dotnet/sdk/issues/34003 * Update dependencies from https://github.com/dotnet/xharness build 20230713.3 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 8.0.0-prerelease.23360.3 -> To Version 8.0.0-prerelease.23363.3 * Add reference to NETStandard.Library --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Viktor Hofer Co-authored-by: Elinor Fung --- .config/dotnet-tools.json | 2 +- eng/Tools.props | 3 - eng/Version.Details.xml | 97 +++++++++---------- eng/Versions.props | 38 ++++---- global.json | 10 +- ...ndencyInjection.Specification.Tests.csproj | 6 ++ ...soft.Extensions.Logging.Generators.targets | 3 + .../src/System.Net.Quic.csproj | 5 + 8 files changed, 85 insertions(+), 79 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 26f761c6f2c..f47833d636e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.23360.3", + "version": "8.0.0-prerelease.23363.3", "commands": [ "xharness" ] diff --git a/eng/Tools.props b/eng/Tools.props index ddfad5ff039..2c3560f68a3 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -7,9 +7,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cb234248ac..967d137e972 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,9 +90,9 @@ 1a6a83a8f50e1119f1007b1e3c211d3289ba6901 - + https://github.com/dotnet/emsdk - afbff08914374ed6790324635b9346d1256680fc + 96c6e0d2c0bb8a90d6b49eb3ffa32593f7df7a18 @@ -107,84 +107,79 @@ - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - - https://github.com/dotnet/sourcelink - a1eed1e0522f47f4fbf60ed5f8caef3679208d66 - - - + https://github.com/dotnet/xliff-tasks - 10a822a79bde97ca45faa76dc4ec33b85533728a + a171b61473272e5a6d272117963864ba958a012a - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 https://github.com/dotnet/runtime-assets @@ -319,21 +314,21 @@ https://github.com/dotnet/runtime ab7c4528edb5301cb849f5e114b7f3cc1dea8149 - + https://github.com/dotnet/xharness - ca022cb79bab7a3402802dadec2755e267156793 + b0548ed270ed98fa14ab0fcc5ef7af99fad00237 - + https://github.com/dotnet/xharness - ca022cb79bab7a3402802dadec2755e267156793 + b0548ed270ed98fa14ab0fcc5ef7af99fad00237 - + https://github.com/dotnet/xharness - ca022cb79bab7a3402802dadec2755e267156793 + b0548ed270ed98fa14ab0fcc5ef7af99fad00237 - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0e2a920244a..accb84b8793 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,21 +83,21 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 2.5.1-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 - 8.0.0-beta.23361.1 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 2.5.1-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 + 8.0.0-beta.23362.5 6.0.0-preview.1.102 @@ -179,9 +179,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 8.0.0-prerelease.23360.3 - 8.0.0-prerelease.23360.3 - 8.0.0-prerelease.23360.3 + 8.0.0-prerelease.23363.3 + 8.0.0-prerelease.23363.3 + 8.0.0-prerelease.23363.3 8.0.0-alpha.0.23360.1 2.4.2 1.0.0 @@ -236,7 +236,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport --> - 8.0.0-preview.7.23361.2 + 8.0.0-preview.7.23362.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda diff --git a/global.json b/global.json index 015b2bd8da0..a3f2590ff65 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "8.0.100-preview.5.23303.2", + "version": "8.0.100-preview.6.23330.14", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-preview.5.23303.2" + "dotnet": "8.0.100-preview.6.23330.14" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23361.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23361.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23361.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23362.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23362.5", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23362.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.7.23359.3" diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj index af88313e6c1..13eefea9b5a 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj @@ -21,6 +21,12 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets index 584454e72a8..dfc5b8e9ad7 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets @@ -6,6 +6,9 @@ true enable true + + $(NoWarn);NETSDK1206 diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj index 53b39492c39..96ffb0c06bf 100644 --- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj +++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj @@ -130,6 +130,11 @@ + + + <_KnownRuntimeIdentiferPlatforms Include="osx;win" /> + +