From 5566501db2ec6c2b581773710e4cf258005a697f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jul 2023 12:08:28 +0000 Subject: [PATCH 1/8] 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 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 10 +++--- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cb234248ac033..3d9cc925d84293 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,84 +107,84 @@ - + https://github.com/dotnet/arcade - 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 + 7f922d5c3edb921ed36d169263c55065e235b333 - + https://github.com/dotnet/sourcelink - a1eed1e0522f47f4fbf60ed5f8caef3679208d66 + d2e046aec870a5a7601cc51c5607f34463cc2d42 - + 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 @@ -331,9 +331,9 @@ https://github.com/dotnet/xharness ca022cb79bab7a3402802dadec2755e267156793 - + 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 0e2a920244aad4..e1ea910569662f 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 diff --git a/global.json b/global.json index 015b2bd8da0573..a3f2590ff65cbc 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" From 9618c4b2d6b7d24ccddef55e45a978fcf019f458 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jul 2023 12:34:19 +0000 Subject: [PATCH 2/8] 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 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d9cc925d84293..6e7f7bdd3090e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,9 +90,9 @@ 1a6a83a8f50e1119f1007b1e3c211d3289ba6901 - + https://github.com/dotnet/emsdk - afbff08914374ed6790324635b9346d1256680fc + 96c6e0d2c0bb8a90d6b49eb3ffa32593f7df7a18 diff --git a/eng/Versions.props b/eng/Versions.props index e1ea910569662f..0080f65385402b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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 From 26e30926050c5055b6fafe09b1a95e8b2824a887 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Jul 2023 19:57:58 +0200 Subject: [PATCH 3/8] Update Tools.props --- eng/Tools.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/Tools.props b/eng/Tools.props index ddfad5ff039d6f..2c3560f68a3e51 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -7,9 +7,6 @@ - - - From ea7c09bd7884c62e93052b7b1b2f2bc1672deed8 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Jul 2023 19:59:00 +0200 Subject: [PATCH 4/8] Update Version.Details.xml --- eng/Version.Details.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e7f7bdd3090e6..fbc6441d647b76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -112,11 +112,6 @@ 7f922d5c3edb921ed36d169263c55065e235b333 - - https://github.com/dotnet/sourcelink - d2e046aec870a5a7601cc51c5607f34463cc2d42 - - https://github.com/dotnet/xliff-tasks a171b61473272e5a6d272117963864ba958a012a From 7c3b1d44602aa1b43be3857d9770137e4c23c604 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Thu, 13 Jul 2023 15:54:44 -0700 Subject: [PATCH 5/8] Suppress warning in test --- ...Extensions.DependencyInjection.Specification.Tests.csproj | 5 +++++ .../Microsoft.Extensions.Logging.Generators.targets | 3 +++ 2 files changed, 8 insertions(+) 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 af88313e6c1308..d2715b9fda3aab 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 @@ -15,6 +15,11 @@ Suite of xUnit.net tests to check for container compatibility with Microsoft.Extensions.DependencyInjection. false + + $(NoWarn);NETSDK1206 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 584454e72a8cd3..dfc5b8e9ad7856 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 From e426ecf6d85dab033d07c683dca5cc56c329fb27 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Thu, 13 Jul 2023 17:19:39 -0700 Subject: [PATCH 6/8] Workaround for https://github.com/dotnet/sdk/issues/34003 --- src/libraries/System.Net.Quic/src/System.Net.Quic.csproj | 5 +++++ 1 file changed, 5 insertions(+) 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 53b39492c39a4e..96ffb0c06bf392 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" /> + + Date: Fri, 14 Jul 2023 12:11:23 +0000 Subject: [PATCH 7/8] 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 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 26f761c6f2c7d0..f47833d636e656 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/Version.Details.xml b/eng/Version.Details.xml index fbc6441d647b76..967d137e97210e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -314,17 +314,17 @@ 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 diff --git a/eng/Versions.props b/eng/Versions.props index 0080f65385402b..accb84b879379d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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 From 2adf3d901d4691c35f8966d6ecae1160cc1609c1 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Fri, 14 Jul 2023 09:17:58 -0700 Subject: [PATCH 8/8] Add reference to NETStandard.Library --- ...ons.DependencyInjection.Specification.Tests.csproj | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 d2715b9fda3aab..13eefea9b5abee 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 @@ -15,17 +15,18 @@ Suite of xUnit.net tests to check for container compatibility with Microsoft.Extensions.DependencyInjection. false - - $(NoWarn);NETSDK1206 + + +