From 1e9466d9a2913f3a45893851f79b54da11ba3069 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 16:44:17 -0600 Subject: [PATCH] [release/7.0] Update dependencies from dotnet/arcade (#83467) * Update dependencies from https://github.com/dotnet/arcade build 20230314.3 Microsoft.DotNet.ApiCompat , 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 7.0.0-beta.23114.3 -> To Version 7.0.0-beta.23164.3 * Supress architecture mismatch warning for CoreLib * Suppress arch mismatch warnings in interop tests. * Fix host tests --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: carlossanlop Co-authored-by: Elinor Fung --- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 32 ++++---- eng/resolveContract.targets | 6 +- global.json | 10 +-- .../TestProjects/PortableApp/Program.cs | 1 + .../StartupHookWithDependency.cs | 1 + .../LibraryImportGenerator.Tests.csproj | 3 +- 7 files changed, 67 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fff48ac16e8d..ce81cb78539bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,77 +58,77 @@ - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 https://github.com/dotnet/runtime-assets @@ -258,9 +258,9 @@ https://github.com/dotnet/xharness 5ebf69650b9f7b4ecab485be840b3022420f7812 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 099bbb071e187ba4e1603004597624e6acae6394 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index d324ea77ca16b..50df713baa294 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 7.0.100-rc.1.22402.1 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 2.5.1-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 - 7.0.0-beta.23114.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 2.5.1-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 + 7.0.0-beta.23164.3 6.0.0-preview.1.102 diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets index 0aaf56d0a9731..179813179a9b2 100644 --- a/eng/resolveContract.targets +++ b/eng/resolveContract.targets @@ -62,14 +62,16 @@ AfterTargets="ResolveProjectReferences" BeforeTargets="FindReferenceAssembliesForReferences" Condition="'@(ProjectReference)' != '' and '@(_ResolvedProjectReferencePaths)' != ''"> - + false + None <_resolvedP2PFiltered Include="@(ProjectReference)" - ProjectReferenceItemSpec="$([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)'))" + ProjectReferenceItemSpec="$([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)'))" SkipUseReferenceAssembly="%(ProjectReference.SkipUseReferenceAssembly)" /> <_ResolvedProjectReferencePaths Condition="'%(_resolvedP2PFiltered.ProjectReferenceItemSpec)' == '%(_resolvedP2PFiltered.MSBuildSourceProjectFile)' and '%(_resolvedP2PFiltered.SkipUseReferenceAssembly)' == 'true'" diff --git a/global.json b/global.json index 24554da4db906..4a7f1a9cdb1f6 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "7.0.103", + "version": "7.0.104", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.103" + "dotnet": "7.0.104" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23114.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23114.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23164.3", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23164.3", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6" diff --git a/src/installer/tests/Assets/TestProjects/PortableApp/Program.cs b/src/installer/tests/Assets/TestProjects/PortableApp/Program.cs index c05e2d89d0b1f..bde1de9cb84e2 100644 --- a/src/installer/tests/Assets/TestProjects/PortableApp/Program.cs +++ b/src/installer/tests/Assets/TestProjects/PortableApp/Program.cs @@ -16,6 +16,7 @@ public static void Main(string[] args) // A small operation involving NewtonSoft.Json to ensure the assembly is loaded properly var t = typeof(Newtonsoft.Json.JsonReader); + System.Diagnostics.Trace.WriteLine(t); } } } diff --git a/src/installer/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.cs b/src/installer/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.cs index 9178e26b84e47..dddc9580c3b74 100644 --- a/src/installer/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.cs +++ b/src/installer/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.cs @@ -13,5 +13,6 @@ public static void Initialize() // A small operation involving NewtonSoft.Json to ensure the assembly is loaded properly var t = typeof(Newtonsoft.Json.JsonReader); + System.Diagnostics.Trace.WriteLine(t); } } diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/LibraryImportGenerator.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/LibraryImportGenerator.Tests.csproj index ad8f6d61e84d5..485c95540f8f1 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/LibraryImportGenerator.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/LibraryImportGenerator.Tests.csproj @@ -4,13 +4,14 @@ true true false + None - +