From f9b3de7136c749720c7a535ab3319efe81c48693 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 13:08:18 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20230223.2 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.23120.1 -> To Version 8.0.0-beta.23123.2 --- eng/Version.Details.xml | 72 ++++++++++++++++---------------- eng/Versions.props | 30 ++++++------- eng/common/cross/build-rootfs.sh | 25 ++++++++--- eng/common/templates/job/job.yml | 8 ++-- global.json | 10 ++--- 5 files changed, 80 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78cc5c13b5cb8..13fb2f2ca6d7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,73 +100,73 @@ - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 https://github.com/dotnet/runtime-assets @@ -296,9 +296,9 @@ https://github.com/dotnet/xharness 8d789cbeecb6c89bf470fdc7727a8f501724fc8a - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 14a25100796b8..6c7a3544e14d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 2.5.1-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 - 8.0.0-beta.23120.1 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 2.5.1-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 + 8.0.0-beta.23123.2 6.0.0-preview.1.102 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index ffaa88eb0f06d..f027af7597872 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -260,25 +260,40 @@ while :; do ;; jessie) # Debian 8 __CodeName=jessie - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; stretch) # Debian 9 __CodeName=stretch - __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; buster) # Debian 10 __CodeName=buster - __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; bullseye) # Debian 11 __CodeName=bullseye - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; sid) # Debian sid __CodeName=sid - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; tizen) __CodeName= diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index aca6446eb1dcc..b214a31db2361 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -83,7 +83,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -164,7 +164,7 @@ jobs: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -214,7 +214,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -225,7 +225,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/global.json b/global.json index dd12868408691..70bdc0cfb8fdc 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "8.0.100-alpha.1.23061.8", + "version": "8.0.100-preview.1.23115.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-alpha.1.23061.8" + "dotnet": "8.0.100-preview.1.23115.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23120.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23120.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23120.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23123.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23123.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23123.2", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-preview.2.23112.4" From 78cadedc3dfd6a91dad527f8ca5370eda3fecdad Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Fri, 24 Feb 2023 11:41:11 -0800 Subject: [PATCH 2/4] Suppress architecture mismatch warning for CoreLib --- Directory.Build.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 5f92d5d4685e8..c27601fa07b7e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -139,9 +139,11 @@ AfterTargets="ResolveProjectReferences" BeforeTargets="FindReferenceAssembliesForReferences" Condition="'@(ProjectReference)' != '' and '@(_ResolvedProjectReferencePaths)' != ''"> - + false + None From 8b191faff16bf5a361342110a187df1fbb2c0aba Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Fri, 24 Feb 2023 14:45:36 -0800 Subject: [PATCH 3/4] Suppress arch mismatch warnings in interop tests. --- .../ComInterfaceGenerator.Tests.csproj | 2 ++ .../LibraryImportGenerator.Tests.csproj | 1 + 2 files changed, 3 insertions(+) diff --git a/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Tests/ComInterfaceGenerator.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Tests/ComInterfaceGenerator.Tests.csproj index 56e29a19f19e1..b8947960debca 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Tests/ComInterfaceGenerator.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Tests/ComInterfaceGenerator.Tests.csproj @@ -7,6 +7,8 @@ true false + + None 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..3f40e8de17830 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,6 +4,7 @@ true true false + None From 4637874b697033e9342be5b9877b6c24edaff447 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Mon, 27 Feb 2023 17:11:35 -0800 Subject: [PATCH 4/4] Fix host tests --- src/installer/tests/Assets/TestProjects/PortableApp/Program.cs | 1 + .../StartupHookWithDependency/StartupHookWithDependency.cs | 1 + 2 files changed, 2 insertions(+) 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); } }