From 7a071a7e1b087998ddd71890ba1410319f8f5e1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Sep 2022 20:53:18 +0000 Subject: [PATCH 01/39] Update dependencies from https://github.com/dotnet/arcade build 20220920.1 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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22470.1 --- eng/Version.Details.xml | 76 ++++++++++----------- eng/Versions.props | 32 ++++----- eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/steps/source-build.yml | 8 ++- global.json | 10 +-- 5 files changed, 67 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7fd31ede6bf2..373acd7a2d9b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 https://github.com/dotnet/runtime-assets @@ -242,9 +242,9 @@ https://github.com/dotnet/xharness 244b3f6d2ee12b4a8a445e462471d0e28337b253 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index df5657e780f4e..986eb22ebe210 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 2.5.1-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 2.5.1-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 + 8.0.0-beta.22470.1 6.0.0-preview.1.102 diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3bfd3..8dd2d355f22d2 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 12a8ff94d8e96..4ec5577d28a0c 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -68,6 +68,11 @@ steps: publishArgs='--publish' fi + assetManifestFileName=SourceBuild_RidSpecific.xml + if [ '${{ parameters.platform.name }}' != '' ]; then + assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml + fi + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ @@ -76,7 +81,8 @@ steps: $internalRestoreArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ - /p:ArcadeBuildFromSource=true + /p:ArcadeBuildFromSource=true \ + /p:AssetManifestFileName=$assetManifestFileName displayName: Build # Upload build logs for diagnosis. diff --git a/global.json b/global.json index 89f0de5bee247..c57d53ae04abd 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "7.0.100-preview.7.22377.5", + "version": "7.0.100-rc.1.22431.12", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.100-preview.7.22377.5" + "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22469.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22469.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22469.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22470.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22470.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22470.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22468.3" From dc60fafbe392f152a2a43767c8ffb127e789aee3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Sep 2022 12:14:15 +0000 Subject: [PATCH 02/39] Update dependencies from https://github.com/dotnet/arcade build 20220920.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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22470.3 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 373acd7a2d9b4..7514b7588953e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d https://github.com/dotnet/runtime-assets @@ -242,9 +242,9 @@ https://github.com/dotnet/xharness 244b3f6d2ee12b4a8a445e462471d0e28337b253 - + https://github.com/dotnet/arcade - 00e07eb732f83fb2b0fbb2a27bffa13e3ceae522 + 025103bcaefad81506465eeb7bb09b107b20f32d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 986eb22ebe210..fb154a1245778 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 2.5.1-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 - 8.0.0-beta.22470.1 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 2.5.1-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 + 8.0.0-beta.22470.3 6.0.0-preview.1.102 diff --git a/global.json b/global.json index c57d53ae04abd..7591d199dd728 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22470.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22470.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22470.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22470.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22470.3", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22470.3", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22468.3" From e29027e0d7996351501cd05571b8845be2125f96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Sep 2022 12:18:34 +0000 Subject: [PATCH 03/39] Update dependencies from https://github.com/dotnet/arcade build 20220921.2 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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22471.2 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- eng/common/build.ps1 | 5 +++ global.json | 6 ++-- 4 files changed, 62 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7514b7588953e..b0f2a00b73abd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 https://github.com/dotnet/runtime-assets @@ -242,9 +242,9 @@ https://github.com/dotnet/xharness 244b3f6d2ee12b4a8a445e462471d0e28337b253 - + https://github.com/dotnet/arcade - 025103bcaefad81506465eeb7bb09b107b20f32d + d179a8bfc4f295329bbbed456d088a0dfbc61a56 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index fb154a1245778..b41fb420bb7ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 2.5.1-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 - 8.0.0-beta.22470.3 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 2.5.1-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 + 8.0.0-beta.22471.2 6.0.0-preview.1.102 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242f6e9..33a6f2d0e2481 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/global.json b/global.json index 7591d199dd728..488a1d5fcd2a5 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22470.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22470.3", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22470.3", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22471.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22471.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22471.2", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22468.3" From 84fa77f85d57563da18b978c67125a483c7e0df2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 12:12:55 +0000 Subject: [PATCH 04/39] Update dependencies from https://github.com/dotnet/arcade build 20220922.1 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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22472.1 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0f2a00b73abd..c882acdeae3de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 https://github.com/dotnet/runtime-assets @@ -242,9 +242,9 @@ https://github.com/dotnet/xharness 244b3f6d2ee12b4a8a445e462471d0e28337b253 - + https://github.com/dotnet/arcade - d179a8bfc4f295329bbbed456d088a0dfbc61a56 + 00d7e107ffaa9613733e390a282bd1e13c1d8d17 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index b41fb420bb7ca..c37f39d65acb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 2.5.1-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 - 8.0.0-beta.22471.2 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 2.5.1-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 + 8.0.0-beta.22472.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 488a1d5fcd2a5..c95d8666f06c5 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22471.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22471.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22471.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22472.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22472.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22472.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22468.3" From d13ef4f9bf9a525ebe393a82ff098ec647f7eed7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Sep 2022 12:13:39 +0000 Subject: [PATCH 05/39] Update dependencies from https://github.com/dotnet/arcade build 20220923.1 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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22473.1 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c882acdeae3de..56c8ac60fbdc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c https://github.com/dotnet/runtime-assets @@ -242,9 +242,9 @@ https://github.com/dotnet/xharness 244b3f6d2ee12b4a8a445e462471d0e28337b253 - + https://github.com/dotnet/arcade - 00d7e107ffaa9613733e390a282bd1e13c1d8d17 + ba4d2568dd2e3e7538feeaba60215f7bcb99e89c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c37f39d65acb7..78a5e25e17909 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 2.5.1-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 - 8.0.0-beta.22472.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 2.5.1-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 + 8.0.0-beta.22473.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index c95d8666f06c5..ad270fc027cc0 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22472.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22472.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22472.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22473.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22473.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22473.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22468.3" From cb4f0e2d11d197dfa97a36cf048e2ca518ec6fcf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 12:14:06 +0000 Subject: [PATCH 06/39] Update dependencies from https://github.com/dotnet/arcade build 20220926.4 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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22476.4 --- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 32 ++++---- eng/common/templates/job/execute-sdl.yml | 2 +- .../templates/post-build/post-build.yml | 4 +- global.json | 6 +- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56c8ac60fbdc8..f75aaa309a859 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 https://github.com/dotnet/runtime-assets @@ -242,9 +242,9 @@ https://github.com/dotnet/xharness 244b3f6d2ee12b4a8a445e462471d0e28337b253 - + https://github.com/dotnet/arcade - ba4d2568dd2e3e7538feeaba60215f7bcb99e89c + 56800483b84c4934d0312a84978c2be0ebe27fa0 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 78a5e25e17909..eb2c373d44373 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 2.5.1-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 - 8.0.0-beta.22473.1 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 2.5.1-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 + 8.0.0-beta.22476.4 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 781a41c940423..65f87b40c66ae 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -34,7 +34,7 @@ jobs: - job: Run_SDL dependsOn: ${{ parameters.dependsOn }} displayName: Run SDL tool - condition: eq( ${{ parameters.enable }}, 'true') + condition: and(succeededOrFailed(), eq( ${{ parameters.enable }}, 'true')) variables: - group: DotNet-VSTS-Bot - name: AzDOProjectName diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 87fcae940cff0..258ed2d110810 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -98,7 +98,7 @@ stages: jobs: - job: displayName: NuGet Validation - condition: eq( ${{ parameters.enableNugetValidation }}, 'true') + condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: @@ -282,4 +282,4 @@ stages: -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/global.json b/global.json index ad270fc027cc0..17d7481e3469e 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22473.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22473.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22473.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22476.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22476.4", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22476.4", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22468.3" From d09d539704e6a4e56f90baeb4c841c8621694679 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 12:13:01 +0000 Subject: [PATCH 07/39] Update dependencies from https://github.com/dotnet/arcade build 20220927.1 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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22477.1 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f75aaa309a859..cb2d8830f0856 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb https://github.com/dotnet/runtime-assets @@ -242,9 +242,9 @@ https://github.com/dotnet/xharness 244b3f6d2ee12b4a8a445e462471d0e28337b253 - + https://github.com/dotnet/arcade - 56800483b84c4934d0312a84978c2be0ebe27fa0 + 0213f8ad31ac8c63ad41760f02a929998abf69bb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index eb2c373d44373..1ce1de6d8f86d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 2.5.1-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 - 8.0.0-beta.22476.4 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 2.5.1-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 + 8.0.0-beta.22477.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 17d7481e3469e..841574e7dbffd 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22476.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22476.4", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22476.4", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22477.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22477.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22477.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22468.3" From 60e9f8c1a938c4fc0dab2a66fcc8d8af579ffd98 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 10:49:47 +0000 Subject: [PATCH 08/39] InstallWorkloadFromArtifacts: Remove hack because we have an updated sdk now --- .../InstallWorkloadFromArtifacts.cs | 47 ------------------- 1 file changed, 47 deletions(-) diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index 94e255df990ed..e0f420941785c 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -41,14 +41,6 @@ public class InstallWorkloadFromArtifacts : Task private const string s_nugetInsertionTag = ""; private string AllManifestsStampPath => Path.Combine(SdkWithNoWorkloadInstalledPath, ".all-manifests.stamp"); - private static readonly string[] s_manifestIds = new[] - { - "microsoft.net.workload.mono.toolchain", - "microsoft.net.workload.emscripten.net6", - "microsoft.net.workload.emscripten.net7", - "microsoft.net.workload.mono.toolchain.net6", - "microsoft.net.workload.mono.toolchain.net7" - }; public override bool Execute() { @@ -154,8 +146,6 @@ private bool InstallAllManifests() return true; } - ExecuteHackForInstallerMismatch(); - string nugetConfigContents = GetNuGetConfig(); HashSet manifestsInstalled = new(); foreach (ITaskItem workload in WorkloadIds) @@ -185,43 +175,6 @@ private bool InstallAllManifests() File.WriteAllText(AllManifestsStampPath, string.Empty); return true; - - void ExecuteHackForInstallerMismatch() - { - // HACK - because sdk doesn't yet have the version-less manifest names in the known - // workloads list - string? txtPath = Directory.EnumerateFiles(Path.Combine(SdkWithNoWorkloadInstalledPath, "sdk"), "IncludedWorkloadManifests.txt", - new EnumerationOptions { RecurseSubdirectories = true, MaxRecursionDepth = 2}) - .FirstOrDefault(); - if (txtPath is null) - throw new LogAsErrorException($"Could not find IncludedWorkloadManifests.txt in {SdkWithNoWorkloadInstalledPath}"); - - string stampPath = Path.Combine(Path.GetDirectoryName(txtPath)!, ".stamp"); - if (File.Exists(stampPath)) - return; - - List lines = File.ReadAllLines(txtPath).ToList(); - int originalCount = lines.Count; - - // we want to insert the manifests in a fixed order - // so first remove all of them - foreach (string manifestId in s_manifestIds) - lines.Remove(manifestId); - // .. and then insert - lines.AddRange(s_manifestIds); - - // currently using emscripten.net7 instead of this, - // so remove it from the list - lines.Remove("microsoft.net.workload.emscripten"); - - if (lines.Count != originalCount) - { - // Update the file only if we are making any changes - File.WriteAllText(txtPath, string.Join(Environment.NewLine, lines)); - } - - File.WriteAllText(stampPath, ""); - } } private bool InstallPacks(InstallWorkloadRequest req, string nugetConfigContents) From 55120ac60c3b53bdadd7f8a2348abe33c9db037b Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 10:52:07 +0000 Subject: [PATCH 09/39] [wasm] WBT: Make project names unique --- .../BlazorWasmBuildPublishTests.cs | 18 +++++++++--------- .../wasm/Wasm.Build.Tests/NativeBuildTests.cs | 2 +- .../NoopNativeRebuildTest.cs | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs index 8123c9cfc1c9e..a3f250b462394 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs @@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC [InlineData("Release")] public void DefaultTemplate_WithoutWorkload(string config) { - string id = $"blz_no_workload_{config}"; + string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}"; CreateBlazorWasmTemplateProject(id); // Build @@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config) [InlineData("Release")] public void DefaultTemplate_NoAOT_WithWorkload(string config) { - string id = $"blz_no_aot_{config}"; + string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}"; CreateBlazorWasmTemplateProject(id); BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack)); @@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config) [InlineData("Release")] public void DefaultTemplate_AOT_InProjectFile(string config) { - string id = $"blz_aot_prj_file_{config}"; + string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}"; string projectFile = CreateBlazorWasmTemplateProject(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); @@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config) [InlineData("Debug", false)] [InlineData("Release", true)] [InlineData("Release", false)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)] + //[ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)] public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRelink) { - string id = $"blz_deploy_on_build_{config}_{nativeRelink}"; + string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}"; string projectFile = CreateProjectWithNativeReference(id); AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "true"); @@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)] public void WithNativeReference_AOTInProjectFile(string config) { - string id = $"blz_nativeref_aot_{config}"; + string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}"; string projectFile = CreateProjectWithNativeReference(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); @@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config) [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)] public void WithNativeReference_AOTOnCommandLine(string config) { - string id = $"blz_nativeref_aot_{config}"; + string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}"; CreateProjectWithNativeReference(id); BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked)); @@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config) public void WithDllImportInMainAssembly(string config) { // Based on https://github.com/dotnet/runtime/issues/59255 - string id = $"blz_dllimp_{config}"; + string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}"; string projectFile = CreateProjectWithNativeReference(id); string nativeSource = @" #include @@ -233,7 +233,7 @@ void CheckNativeFileLinked(bool forPublish) [Fact] public void BugRegression_60479_WithRazorClassLib() { - string id = "blz_razor_lib_top"; + string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}"; InitBlazorWasmProjectDir(id); string wasmProjectDir = Path.Combine(_projectDir!, "wasm"); diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs b/src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs index 17d140f9a562f..9c8b7c03204f9 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs @@ -106,7 +106,7 @@ public void IntermediateBitcodeToObjectFilesAreNotLLVMIR(BuildArgs buildArgs, st [InlineData("Release")] public void BlazorWasm_CanRunMonoAOTCross_WithNoTrimming(string config) { - string id = $"blazorwasm_{config}_aot"; + string id = $"blazorwasm_{config}_aot_{Path.GetRandomFileName()}"; CreateBlazorWasmTemplateProject(id); // We don't want to emcc compile, and link ~180 assemblies! diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs index 1cc525391ad77..1359202b698fd 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs @@ -40,7 +40,7 @@ public void NoOpRebuildForNativeBuilds(BuildArgs buildArgs, bool nativeRelink, b [InlineData("Release")] public void BlazorNoopRebuild(string config) { - string id = $"blz_rebuild_{config}"; + string id = $"blz_rebuild_{config}_{Path.GetRandomFileName()}"; string projectFile = CreateBlazorWasmTemplateProject(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); @@ -67,7 +67,7 @@ public void BlazorNoopRebuild(string config) [InlineData("Release")] public void BlazorOnlyLinkRebuild(string config) { - string id = $"blz_relink_{config}"; + string id = $"blz_relink_{config}_{Path.GetRandomFileName()}"; string projectFile = CreateBlazorWasmTemplateProject(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); From 0678940b38ccb2f10509bc6b5e674ba67cb4de10 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 10:56:39 +0000 Subject: [PATCH 10/39] [wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project directory --- .../BlazorWasmBuildPublishTests.cs | 2 ++ src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs | 2 ++ src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs | 15 ++++++++------- src/mono/wasm/Wasm.Build.Tests/CleanTests.cs | 2 ++ .../wasm/Wasm.Build.Tests/NativeBuildTests.cs | 1 + src/mono/wasm/Wasm.Build.Tests/RunCommand.cs | 1 + src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs | 2 +- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs index a3f250b462394..39f7dfba8587f 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs @@ -241,6 +241,7 @@ public void BugRegression_60479_WithRazorClassLib() Directory.CreateDirectory(wasmProjectDir); new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false) .WithWorkingDirectory(wasmProjectDir) + .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir) .ExecuteWithCapturedOutput("new blazorwasm") .EnsureSuccessful(); @@ -249,6 +250,7 @@ public void BugRegression_60479_WithRazorClassLib() Directory.CreateDirectory(razorProjectDir); new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false) .WithWorkingDirectory(razorProjectDir) + .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir) .ExecuteWithCapturedOutput("new razorclasslib") .EnsureSuccessful(); diff --git a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs index cfb725bd59f22..91cf6c23156fe 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs @@ -61,6 +61,7 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra string publishLogPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}.binlog"); return new DotNetCommand(s_buildEnv, _testOutput) .WithWorkingDirectory(_projectDir!) + .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir) .ExecuteWithCapturedOutput("publish", $"-bl:{publishLogPath}", $"-p:Configuration={config}"); @@ -109,6 +110,7 @@ private void BuildNet50Project(string config, bool aot, bool expectError, string string publishLogPath = Path.Combine(logPath, $"{id}.binlog"); CommandResult result = new DotNetCommand(s_buildEnv, _testOutput) .WithWorkingDirectory(_projectDir!) + .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir) .ExecuteWithCapturedOutput("publish", $"-bl:{publishLogPath}", (aot ? "-p:RunAOTCompilation=true" : ""), diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index f4a73bdbb0fe5..d427f1d1f348d 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -36,6 +36,7 @@ public abstract class BuildTestBase : IClassFixture ExecuteAsync(params string[] args) { var resolvedCommand = _command; string fullArgs = GetFullArgs(args); - _testOutput.WriteLine($"[{_label}] Executing - {resolvedCommand} {fullArgs} - {WorkingDirectoryInfo()}"); + _testOutput.WriteLine($"[{_label}] Executing - {resolvedCommand} {fullArgs} {WorkingDirectoryInfo()}"); return await ExecuteAsyncInternal(resolvedCommand, fullArgs); } From 0aa1b5a9813d3815754e9f9fd201044c33e7b31c Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 11:08:56 +0000 Subject: [PATCH 11/39] [wasm] WBT: Fixes to work with latest sdk - Use only one source of which tfm to use - Allow a different tfm for blazor - Add `dotnet8` nuget feed for tests - Support more than one choice for nuget.config, like for net7, or net8 --- .../BlazorWasmBuildPublishTests.cs | 2 +- .../wasm/Wasm.Build.Tests/BuildEnvironment.cs | 3 - .../wasm/Wasm.Build.Tests/BuildTestBase.cs | 68 ++++++++++++------- src/mono/wasm/Wasm.Build.Tests/CleanTests.cs | 4 +- .../wasm/Wasm.Build.Tests/HelperExtensions.cs | 3 +- .../NoopNativeRebuildTest.cs | 4 +- .../PInvokeTableGeneratorTests.cs | 1 + .../Wasm.Build.Tests/WasmTemplateTests.cs | 12 ++-- .../data/Blazor.Local.Directory.Build.props | 1 - .../data/Blazor.Local.Directory.Build.targets | 5 -- .../wasm/Wasm.Build.Tests/data/nuget7.config | 3 + 11 files changed, 61 insertions(+), 45 deletions(-) delete mode 100644 src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props delete mode 100644 src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets diff --git a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs index 39f7dfba8587f..015a45dd4fa2c 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs @@ -94,7 +94,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel var expectedFileType = nativeRelink ? NativeFilesType.Relinked : NativeFilesType.AOT; - AssertDotNetNativeFiles(expectedFileType, config, forPublish: true); + AssertDotNetNativeFiles(expectedFileType, config, forPublish: true, targetFramework: DefaultTargetFrameworkForBlazor); AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: false); if (expectedFileType == NativeFilesType.AOT) diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs index f921b87037573..fa54ea29d24f6 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs @@ -160,8 +160,5 @@ public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramew protected static string s_directoryBuildPropsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.props")); protected static string s_directoryBuildTargetsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.targets")); - - protected static string s_directoryBuildPropsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.props")); - protected static string s_directoryBuildTargetsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.targets")); } } diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index d427f1d1f348d..fefb56c67029c 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -28,7 +28,7 @@ namespace Wasm.Build.Tests public abstract class BuildTestBase : IClassFixture, IDisposable { public const string DefaultTargetFramework = "net7.0"; - public static readonly string NuGetConfigFileNameForDefaultFramework = $"nuget7.config"; + public const string DefaultTargetFrameworkForBlazor = "net7.0"; protected static readonly bool s_skipProjectCleanup; protected static readonly string s_xharnessRunnerCommand; protected string? _projectDir; @@ -49,6 +49,9 @@ public abstract class BuildTestBase : IClassFixture s_buildEnv.IsWorkload; public static bool IsNotUsingWorkloads => !s_buildEnv.IsWorkload; + public static string GetNuGetConfigPathFor(string targetFramework) => + Path.Combine(BuildEnvironment.TestDataPath, "nuget8.config"); // for now - we are still using net7, but with + // targetFramework == "net7.0" ? "nuget7.config" : "nuget8.config"); static BuildTestBase() { @@ -289,7 +292,7 @@ protected void InitPaths(string id) Directory.CreateDirectory(_logPath); } - protected static void InitProjectDir(string dir, bool addNuGetSourceForLocalPackages = false) + protected void InitProjectDir(string dir, bool addNuGetSourceForLocalPackages = false, string targetFramework = DefaultTargetFramework) { Directory.CreateDirectory(dir); File.WriteAllText(Path.Combine(dir, "Directory.Build.props"), s_buildEnv.DirectoryBuildPropsContents); @@ -300,15 +303,13 @@ protected static void InitProjectDir(string dir, bool addNuGetSourceForLocalPack { File.WriteAllText(targetNuGetConfigPath, GetNuGetConfigWithLocalPackagesPath( - Path.Combine(BuildEnvironment.TestDataPath, NuGetConfigFileNameForDefaultFramework), + GetNuGetConfigPathFor(targetFramework), s_buildEnv.BuiltNuGetsPath)); } else { - File.Copy(Path.Combine(BuildEnvironment.TestDataPath, NuGetConfigFileNameForDefaultFramework), - targetNuGetConfigPath); + File.Copy(GetNuGetConfigPathFor(targetFramework), targetNuGetConfigPath); } - Directory.CreateDirectory(Path.Combine(dir, ".nuget")); } protected const string SimpleProjectTemplate = @@ -414,7 +415,14 @@ protected static BuildArgs ExpandBuildArgs(BuildArgs buildArgs, string extraProp AssertRuntimePackPath(result.buildOutput, options.TargetFramework ?? DefaultTargetFramework); string bundleDir = Path.Combine(GetBinDir(config: buildArgs.Config, targetFramework: options.TargetFramework ?? DefaultTargetFramework), "AppBundle"); - AssertBasicAppBundle(bundleDir, buildArgs.ProjectName, buildArgs.Config, options.MainJS ?? "test-main.js", options.HasV8Script, options.HasIcudt, options.DotnetWasmFromRuntimePack ?? !buildArgs.AOT, options.TargetFramework ?? DefaultTargetFramework); + AssertBasicAppBundle(bundleDir, + buildArgs.ProjectName, + buildArgs.Config, + options.MainJS ?? "test-main.js", + options.HasV8Script, + options.TargetFramework ?? DefaultTargetFramework, + options.HasIcudt, + options.DotnetWasmFromRuntimePack ?? !buildArgs.AOT); } if (options.UseCache) @@ -430,17 +438,16 @@ protected static BuildArgs ExpandBuildArgs(BuildArgs buildArgs, string extraProp } } - public void InitBlazorWasmProjectDir(string id) + public void InitBlazorWasmProjectDir(string id, string targetFramework = DefaultTargetFrameworkForBlazor) { InitPaths(id); if (Directory.Exists(_projectDir)) Directory.Delete(_projectDir, recursive: true); Directory.CreateDirectory(_projectDir); - Directory.CreateDirectory(Path.Combine(_projectDir, ".nuget")); File.WriteAllText(Path.Combine(_projectDir, "nuget.config"), GetNuGetConfigWithLocalPackagesPath( - Path.Combine(BuildEnvironment.TestDataPath, NuGetConfigFileNameForDefaultFramework), + GetNuGetConfigPathFor(targetFramework), s_buildEnv.BuiltNuGetsPath)); File.Copy(Path.Combine(BuildEnvironment.TestDataPath, "Blazor.Directory.Build.props"), Path.Combine(_projectDir, "Directory.Build.props")); @@ -497,8 +504,12 @@ public string CreateBlazorWasmTemplateProject(string id) protected (CommandResult, string) BlazorBuild(BlazorBuildOptions options, params string[] extraArgs) { var res = BuildInternal(options.Id, options.Config, publish: false, setWasmDevel: false, extraArgs); + _testOutput.WriteLine($"BlazorBuild, options.tfm: {options.TargetFramework}"); AssertDotNetNativeFiles(options.ExpectedFileType, options.Config, forPublish: false, targetFramework: options.TargetFramework); - AssertBlazorBundle(options.Config, isPublish: false, dotnetWasmFromRuntimePack: options.ExpectedFileType == NativeFilesType.FromRuntimePack); + AssertBlazorBundle(options.Config, + isPublish: false, + dotnetWasmFromRuntimePack: options.ExpectedFileType == NativeFilesType.FromRuntimePack, + targetFramework: options.TargetFramework); return res; } @@ -507,7 +518,10 @@ public string CreateBlazorWasmTemplateProject(string id) { var res = BuildInternal(options.Id, options.Config, publish: true, setWasmDevel: false, extraArgs); AssertDotNetNativeFiles(options.ExpectedFileType, options.Config, forPublish: true, targetFramework: options.TargetFramework); - AssertBlazorBundle(options.Config, isPublish: true, dotnetWasmFromRuntimePack: options.ExpectedFileType == NativeFilesType.FromRuntimePack); + AssertBlazorBundle(options.Config, + isPublish: true, + dotnetWasmFromRuntimePack: options.ExpectedFileType == NativeFilesType.FromRuntimePack, + targetFramework: options.TargetFramework); if (options.ExpectedFileType == NativeFilesType.AOT) { @@ -539,17 +553,18 @@ public string CreateBlazorWasmTemplateProject(string id) CommandResult res = new DotNetCommand(s_buildEnv, _testOutput) .WithWorkingDirectory(_projectDir!) + .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir) .ExecuteWithCapturedOutput(combinedArgs) .EnsureSuccessful(); return (res, logPath); } - protected void AssertDotNetNativeFiles(NativeFilesType type, string config, bool forPublish, string targetFramework = DefaultTargetFramework) + protected void AssertDotNetNativeFiles(NativeFilesType type, string config, bool forPublish, string targetFramework) { string label = forPublish ? "publish" : "build"; string objBuildDir = Path.Combine(_projectDir!, "obj", config, targetFramework, "wasm", forPublish ? "for-publish" : "for-build"); - string binFrameworkDir = FindBlazorBinFrameworkDir(config, forPublish); + string binFrameworkDir = FindBlazorBinFrameworkDir(config, forPublish, framework: targetFramework); string srcDir = type switch { @@ -590,7 +605,14 @@ static void AssertRuntimePackPath(string buildOutput, string targetFramework) throw new XunitException($"Runtime pack path doesn't match.{Environment.NewLine}Expected: '{expectedRuntimePackDir}'{Environment.NewLine}Actual: '{actualPath}'"); } - protected static void AssertBasicAppBundle(string bundleDir, string projectName, string config, string mainJS, bool hasV8Script, bool hasIcudt=true, bool dotnetWasmFromRuntimePack=true, string targetFramework=DefaultTargetFramework) + protected static void AssertBasicAppBundle(string bundleDir, + string projectName, + string config, + string mainJS, + bool hasV8Script, + string targetFramework, + bool hasIcudt = true, + bool dotnetWasmFromRuntimePack = true) { AssertFilesExist(bundleDir, new [] { @@ -638,7 +660,7 @@ protected static void AssertDotNetWasmJs(string bundleDir, bool fromRuntimePack, same: fromRuntimePack); } - protected static void AssertDotNetJsSymbols(string bundleDir, bool fromRuntimePack, string targetFramework=DefaultTargetFramework) + protected static void AssertDotNetJsSymbols(string bundleDir, bool fromRuntimePack, string targetFramework) => AssertFile(Path.Combine(s_buildEnv.GetRuntimeNativeDir(targetFramework), "dotnet.js.symbols"), Path.Combine(bundleDir, "dotnet.js.symbols"), same: fromRuntimePack); @@ -690,11 +712,11 @@ protected static void AssertFile(string file0, string file1, string? label=null, return result; } - protected void AssertBlazorBundle(string config, bool isPublish, bool dotnetWasmFromRuntimePack, string? binFrameworkDir=null, string targetFramework=DefaultTargetFramework) + protected void AssertBlazorBundle(string config, bool isPublish, bool dotnetWasmFromRuntimePack, string targetFramework = DefaultTargetFrameworkForBlazor, string? binFrameworkDir=null) { - binFrameworkDir ??= FindBlazorBinFrameworkDir(config, isPublish); + binFrameworkDir ??= FindBlazorBinFrameworkDir(config, isPublish, targetFramework); - AssertBlazorBootJson(config, isPublish, binFrameworkDir: binFrameworkDir); + AssertBlazorBootJson(config, isPublish, targetFramework, binFrameworkDir: binFrameworkDir); AssertFile(Path.Combine(s_buildEnv.GetRuntimeNativeDir(targetFramework), "dotnet.wasm"), Path.Combine(binFrameworkDir, "dotnet.wasm"), "Expected dotnet.wasm to be same as the runtime pack", @@ -709,9 +731,9 @@ protected void AssertBlazorBundle(string config, bool isPublish, bool dotnetWasm same: dotnetWasmFromRuntimePack); } - protected void AssertBlazorBootJson(string config, bool isPublish, string? binFrameworkDir=null) + protected void AssertBlazorBootJson(string config, bool isPublish, string targetFramework = DefaultTargetFrameworkForBlazor, string? binFrameworkDir=null) { - binFrameworkDir ??= FindBlazorBinFrameworkDir(config, isPublish); + binFrameworkDir ??= FindBlazorBinFrameworkDir(config, isPublish, targetFramework); string bootJsonPath = Path.Combine(binFrameworkDir, "blazor.boot.json"); Assert.True(File.Exists(bootJsonPath), $"Expected to find {bootJsonPath}"); @@ -728,7 +750,7 @@ protected void AssertBlazorBootJson(string config, bool isPublish, string? binFr $"{msgPrefix} Could not find dotnet.*js in {bootJson}"); } - protected string FindBlazorBinFrameworkDir(string config, bool forPublish, string framework = DefaultTargetFramework) + protected string FindBlazorBinFrameworkDir(string config, bool forPublish, string framework = DefaultTargetFrameworkForBlazor) { string basePath = Path.Combine(_projectDir!, "bin", config, framework); if (forPublish) @@ -1005,6 +1027,6 @@ public record BlazorBuildOptions string Id, string Config, NativeFilesType ExpectedFileType, - string TargetFramework = BuildTestBase.DefaultTargetFramework + string TargetFramework = BuildTestBase.DefaultTargetFrameworkForBlazor ); } diff --git a/src/mono/wasm/Wasm.Build.Tests/CleanTests.cs b/src/mono/wasm/Wasm.Build.Tests/CleanTests.cs index 6be1a736ce140..b113c8443631d 100644 --- a/src/mono/wasm/Wasm.Build.Tests/CleanTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/CleanTests.cs @@ -36,7 +36,7 @@ public void Blazor_BuildThenClean_NativeRelinking(string config) AddItemsPropertiesToProject(projectFile, extraProperties: extraProperties); BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked)); - string relinkDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm", "for-build"); + string relinkDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFrameworkForBlazor, "wasm", "for-build"); Assert.True(Directory.Exists(relinkDir), $"Could not find expected relink dir: {relinkDir}"); string logPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-clean.binlog"); @@ -76,7 +76,7 @@ private void Blazor_BuildNativeNonNative_ThenCleanTest(string config, bool first BuildInternal(id, config, publish: false, extraArgs: relink ? "-p:WasmBuildNative=true" : string.Empty); - string relinkDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm", "for-build"); + string relinkDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFrameworkForBlazor, "wasm", "for-build"); if (relink) Assert.True(Directory.Exists(relinkDir), $"Could not find expected relink dir: {relinkDir}"); diff --git a/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs b/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs index c20aa25a5c43a..11710c3bd1bea 100644 --- a/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs +++ b/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs @@ -5,9 +5,8 @@ using System.Collections.Generic; using System.Linq; using System.IO; +using System.Diagnostics; using System.Text; -using System.Collections; -using Xunit.Abstractions; #nullable enable diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs index 1359202b698fd..e5f17d261811a 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs @@ -44,7 +44,7 @@ public void BlazorNoopRebuild(string config) string projectFile = CreateBlazorWasmTemplateProject(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); - string objDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm"); + string objDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFrameworkForBlazor, "wasm"); BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked)); File.Move(Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build.binlog"), @@ -71,7 +71,7 @@ public void BlazorOnlyLinkRebuild(string config) string projectFile = CreateBlazorWasmTemplateProject(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); - string objDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm"); + string objDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFrameworkForBlazor, "wasm"); BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked), "-p:EmccLinkOptimizationFlag=-O2"); File.Move(Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build.binlog"), diff --git a/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs index 0d7d58b8c24d2..adc68a3e23dc0 100644 --- a/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; +using System.Linq; using Xunit; using Xunit.Abstractions; diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs index cd1500b6619d5..2103a455b6f76 100644 --- a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs @@ -102,7 +102,7 @@ public void BrowserBuildThenPublish(string config) TargetFramework: BuildTestBase.DefaultTargetFramework )); - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: true); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: true, targetFramework: DefaultTargetFramework); if (!_buildContext.TryGetBuildFor(buildArgs, out BuildProduct? product)) throw new XunitException($"Test bug: could not get the build product in the cache"); @@ -123,7 +123,7 @@ public void BrowserBuildThenPublish(string config) TargetFramework: BuildTestBase.DefaultTargetFramework, UseCache: false)); - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking, targetFramework: DefaultTargetFramework); } [Theory] @@ -151,7 +151,7 @@ public void ConsoleBuildThenPublish(string config) TargetFramework: BuildTestBase.DefaultTargetFramework )); - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: true); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: true, targetFramework: DefaultTargetFramework); (int exitCode, string output) = RunProcess(s_buildEnv.DotNet, _testOutput, args: $"run --no-build -c {config}", workingDir: _projectDir); Assert.Equal(0, exitCode); @@ -176,7 +176,7 @@ public void ConsoleBuildThenPublish(string config) TargetFramework: BuildTestBase.DefaultTargetFramework, UseCache: false)); - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking, targetFramework: DefaultTargetFramework); } [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))] @@ -218,7 +218,7 @@ private void ConsoleBuildAndRun(string config, bool relinking, string extraNewAr TargetFramework: BuildTestBase.DefaultTargetFramework )); - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !relinking); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !relinking, targetFramework: DefaultTargetFramework); (int exitCode, string output) = RunProcess(s_buildEnv.DotNet, _testOutput, args: $"run --no-build -c {config} x y z", workingDir: _projectDir); Assert.Equal(42, exitCode); @@ -392,7 +392,7 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking) if (!aot) { // These are disabled for AOT explicitly - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking, targetFramework: DefaultTargetFramework); } else { diff --git a/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props b/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props deleted file mode 100644 index 058246e408620..0000000000000 --- a/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets b/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets deleted file mode 100644 index 6f9b3ab9ef999..0000000000000 --- a/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config index e7ad45f78b8ca..ebbacefcdf226 100644 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config @@ -8,6 +8,9 @@ + + + From 57ff0dd4883469f5fa39b158017f48b1c101c338 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 11:11:39 +0000 Subject: [PATCH 12/39] Revert to test projects created in bindir, instead of a temp one This was necessary because on windows the tmp path is very long, causing the test project paths to become too long causing build failures. --- src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs | 2 +- src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs index fa54ea29d24f6..62f7cc4d762ba 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs @@ -27,7 +27,7 @@ public class BuildEnvironment public static readonly string RelativeTestAssetsPath = @"..\testassets\"; public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets"); public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data"); - public static readonly string TmpPath = Path.Combine(Path.GetTempPath(), "wasmbuildtests"); + public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt"); private static readonly Dictionary s_runtimePackVersions = new(); diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index fefb56c67029c..d6b4d26f3532e 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -281,7 +281,7 @@ protected static string RunWithXHarness(string testCommand, string testLogPath, protected void InitPaths(string id) { if (_projectDir == null) - _projectDir = Path.Combine(AppContext.BaseDirectory, id); + _projectDir = Path.Combine(BuildEnvironment.TmpPath, id); _logPath = Path.Combine(s_buildEnv.LogRootPath, id); _nugetPackagesDir = Path.Combine(BuildEnvironment.TmpPath, "nuget", id); @@ -466,7 +466,7 @@ private static string GetNuGetConfigWithLocalPackagesPath(string templatePath, s public string CreateWasmTemplateProject(string id, string template = "wasmbrowser", string extraArgs = "") { InitPaths(id); - InitProjectDir(id, addNuGetSourceForLocalPackages: true); + InitProjectDir(_projectDir, addNuGetSourceForLocalPackages: true); File.WriteAllText(Path.Combine(_projectDir, "Directory.Build.props"), ""); File.WriteAllText(Path.Combine(_projectDir, "Directory.Build.targets"), From 1a731fb70c36b227359012fbceb622623b768d79 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 11:12:53 +0000 Subject: [PATCH 13/39] [wasm] fix weird build failures `MSBuildSDKsPath` is set by runtime repo, and that interferes with the test projects. To avoid this the `MSBuildSDKsPath` was set to `""` in the test environment. But even that can negatively affect the build because msbuild treats environment variables as "global properties" that cannot be changed. This manifests when running: `$ dotnet run --no-build` .. it would fail with `/foo/bar.csproj is not a valid project file`. Instead, explicitly *remove* `MSBuildSDKsPath` from the environment when invoking the process. --- src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs | 1 - src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs | 3 +++ src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs | 13 +++++++++++++ src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs | 3 +++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs index 62f7cc4d762ba..de8c14b30495b 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs @@ -107,7 +107,6 @@ public BuildEnvironment() EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath; EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0"; EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; - EnvVars["MSBuildSDKsPath"] = string.Empty; EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}"; EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1"; diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index d6b4d26f3532e..7847c95cfc374 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -840,6 +840,9 @@ public static (int exitCode, string buildOutput) RunProcess(string path, processStartInfo.EnvironmentVariables[envVar.Key] = envVar.Value; _testOutput.WriteLine($"\t{envVar.Key} = {envVar.Value}"); } + + // runtime repo sets this, which interferes with the tests + processStartInfo.RemoveEnvironmentVariables("MSBuildSDKsPath"); } Process process = new (); diff --git a/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs b/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs index 11710c3bd1bea..7f36db407e2dd 100644 --- a/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs +++ b/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs @@ -120,5 +120,18 @@ public static void UpdateTo(this IDictionary string.Compare(k, name, StringComparison.OrdinalIgnoreCase) == 0); + if (key is not null) + env.Remove("MSBuildSDKsPath"); + } + + return psi; + } } } diff --git a/src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs b/src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs index a3438f707c4d2..2fae80aa4bdd3 100644 --- a/src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs +++ b/src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs @@ -161,6 +161,8 @@ private Process CreateProcess(string executable, string args) psi.Environment["DOTNET_MULTILEVEL_LOOKUP"] = "0"; psi.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; + // runtime repo sets this, which interferes with the tests + psi.RemoveEnvironmentVariables("MSBuildSDKsPath"); AddEnvironmentVariablesTo(psi); AddWorkingDirectoryTo(psi); var process = new Process @@ -201,6 +203,7 @@ private void AddEnvironmentVariablesTo(ProcessStartInfo psi) { foreach (var item in Environment) { + _testOutput.WriteLine($"\t[{item.Key}] = {item.Value}"); psi.Environment[item.Key] = item.Value; } } From 33dbf9892500e2a6375728f0b5c5eea062dd65bc Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 11:19:08 +0000 Subject: [PATCH 14/39] PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time .. instead of depending on *one* runtime pack version. This is needed when we have more than one workload installed. --- .../Wasm.Build.Tests/PInvokeTableGeneratorTests.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs index adc68a3e23dc0..4c42a30373f09 100644 --- a/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs @@ -462,9 +462,21 @@ public static void Main() """; + string tasksDir = Path.Combine(s_buildEnv.WorkloadPacksDir, + "Microsoft.NET.Runtime.WebAssembly.Sdk", + s_buildEnv.GetRuntimePackVersion(DefaultTargetFramework), + "tasks"); + if (!Directory.Exists(tasksDir)) + throw new DirectoryNotFoundException($"Could not find tasks directory {tasksDir}"); + + string? taskPath = Directory.EnumerateFiles(tasksDir, "WasmAppBuilder.dll", SearchOption.AllDirectories) + .FirstOrDefault(); + if (string.IsNullOrEmpty(taskPath)) + throw new FileNotFoundException($"Could not find WasmAppBuilder.dll in {tasksDir}"); + projectCode = projectCode .Replace("###WasmPInvokeModule###", AddAssembly("System.Private.CoreLib") + AddAssembly("System.Runtime") + AddAssembly(libraryBuildArgs.ProjectName)) - .Replace("###WasmAppBuilder###", Path.Combine(s_buildEnv.WorkloadPacksDir, "Microsoft.NET.Runtime.WebAssembly.Sdk", s_buildEnv.GetRuntimePackVersion(), "tasks", DefaultTargetFramework, "WasmAppBuilder.dll")); + .Replace("###WasmAppBuilder###", taskPath); buildArgs = buildArgs with { ProjectName = $"icall_enum_{buildArgs.Config}_{id}", ProjectFileContents = projectCode }; From 28cfbcd190b09c9b0f7f6046e91ef4eeffac5b71 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 11:20:22 +0000 Subject: [PATCH 15/39] WasmAppHost: allow rollForward to work with newer sdks --- src/mono/wasm/host/WasmAppHost.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mono/wasm/host/WasmAppHost.csproj b/src/mono/wasm/host/WasmAppHost.csproj index 56eef3ea418bf..8a32ea3332d14 100644 --- a/src/mono/wasm/host/WasmAppHost.csproj +++ b/src/mono/wasm/host/WasmAppHost.csproj @@ -6,6 +6,7 @@ $(NoWarn),CA2007 enable false + LatestMajor From 785504e474f7fd3fc6c07027e59edf1c476844a1 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 11:20:59 +0000 Subject: [PATCH 16/39] Don't use the nuget packages directory as fallback. .. because we explicitly set `NUGET_PACKAGES` envvar now. --- src/mono/wasm/Wasm.Build.Tests/data/nuget7.config | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config index ebbacefcdf226..b3c73930eb16a 100644 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config @@ -3,7 +3,6 @@ - From 3a15bdf787af5a75bf07b9f8afcea3d77b010870 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 11:21:33 +0000 Subject: [PATCH 17/39] [wasm] Use the latest sdk for Wasm.Build.Tests --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3a4a2e7e97b9d..124b3564713fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 2.45.0 2.45.0 - 8.0.100-alpha.1.22463.23 + 1.1.2-beta1.22403.2 7.0.0-preview-20220920.1 From dec9861de6002f77471ecf8deafd7b94c9f5001e Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 11:34:05 +0000 Subject: [PATCH 18/39] Add missing nuget8.config --- .../wasm/Wasm.Build.Tests/data/nuget8.config | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/mono/wasm/Wasm.Build.Tests/data/nuget8.config diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config new file mode 100644 index 0000000000000..05a36085b3ad5 --- /dev/null +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + From 33e367920f106c5e01c3f488174ff2b50471ff6f Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 11:47:56 +0000 Subject: [PATCH 19/39] WBT: workaround for https://github.com/dotnet/runtime/issues/76201 --- .../wasm/Wasm.Build.Tests/WasmTemplateTests.cs | 16 +++++++++++++--- .../wasm/Wasm.Build.Tests/data/nuget8.config | 1 - 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs index 2103a455b6f76..5408d9bfa5a52 100644 --- a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs @@ -222,9 +222,19 @@ private void ConsoleBuildAndRun(string config, bool relinking, string extraNewAr (int exitCode, string output) = RunProcess(s_buildEnv.DotNet, _testOutput, args: $"run --no-build -c {config} x y z", workingDir: _projectDir); Assert.Equal(42, exitCode); - Assert.Contains("args[0] = x", output); - Assert.Contains("args[1] = y", output); - Assert.Contains("args[2] = z", output); + if (extraNewArgs.Contains("-f net7.0")) + { + // Workaround for https://github.com/dotnet/runtime/issues/76201 + Assert.Contains("args[0] = dotnet", output); + Assert.Contains("args[1] = is", output); + Assert.Contains("args[2] = great!", output); + } + else + { + Assert.Contains("args[0] = x", output); + Assert.Contains("args[1] = y", output); + Assert.Contains("args[2] = z", output); + } } public static TheoryData TestDataForAppBundleDir() diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config index 05a36085b3ad5..dfdc8009c6a5d 100644 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config @@ -3,7 +3,6 @@ - From 3715daaaf78d8adeebbe9add43c8431596ca6424 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Sep 2022 12:18:18 +0000 Subject: [PATCH 20/39] Update dependencies from https://github.com/dotnet/arcade build 20220928.2 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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22478.2 --- eng/Version.Details.xml | 76 ++++++++++----------- eng/Versions.props | 32 ++++----- eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/steps/source-build.yml | 6 -- global.json | 6 +- 5 files changed, 58 insertions(+), 64 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a03ce44a3ad0..ec61b4d3221df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,77 +86,77 @@ - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec https://github.com/dotnet/runtime-assets @@ -274,9 +274,9 @@ https://github.com/dotnet/xharness a8e8fc0ffeb9b8c56ab799597597ce35d5be6111 - + https://github.com/dotnet/arcade - 0213f8ad31ac8c63ad41760f02a929998abf69bb + 839e1e3b415fc2747dde68f47d940faa414020ec https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 124b3564713fa..e77bcd88bc975 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,22 +57,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 2.5.1-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 - 8.0.0-beta.22477.1 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 2.5.1-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 + 8.0.0-beta.22478.2 6.0.0-preview.1.102 diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 8dd2d355f22d2..bcd8279944ba6 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-latest' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index a97a185a367a9..4ec5577d28a0c 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,11 +63,6 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi - runtimeOsArgs= - if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then - runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' - fi - publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -85,7 +80,6 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ - $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true \ /p:AssetManifestFileName=$assetManifestFileName diff --git a/global.json b/global.json index 8ac3e914408e5..250ea4ad695fc 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22477.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22477.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22477.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22478.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22478.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22478.2", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22475.4" From a1569394adc94c8959973205df6e20dbb8ea92e2 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:55:43 +0000 Subject: [PATCH 21/39] Revert "WBT: workaround for https://github.com/dotnet/runtime/issues/76201" This reverts commit 33e367920f106c5e01c3f488174ff2b50471ff6f. --- .../wasm/Wasm.Build.Tests/WasmTemplateTests.cs | 16 +++------------- .../wasm/Wasm.Build.Tests/data/nuget8.config | 1 + 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs index 5408d9bfa5a52..2103a455b6f76 100644 --- a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs @@ -222,19 +222,9 @@ private void ConsoleBuildAndRun(string config, bool relinking, string extraNewAr (int exitCode, string output) = RunProcess(s_buildEnv.DotNet, _testOutput, args: $"run --no-build -c {config} x y z", workingDir: _projectDir); Assert.Equal(42, exitCode); - if (extraNewArgs.Contains("-f net7.0")) - { - // Workaround for https://github.com/dotnet/runtime/issues/76201 - Assert.Contains("args[0] = dotnet", output); - Assert.Contains("args[1] = is", output); - Assert.Contains("args[2] = great!", output); - } - else - { - Assert.Contains("args[0] = x", output); - Assert.Contains("args[1] = y", output); - Assert.Contains("args[2] = z", output); - } + Assert.Contains("args[0] = x", output); + Assert.Contains("args[1] = y", output); + Assert.Contains("args[2] = z", output); } public static TheoryData TestDataForAppBundleDir() diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config index dfdc8009c6a5d..05a36085b3ad5 100644 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config @@ -3,6 +3,7 @@ + From 654ff9f7198c8de51299da457f0bf93816b1744a Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:55:48 +0000 Subject: [PATCH 22/39] Revert "Add missing nuget8.config" This reverts commit dec9861de6002f77471ecf8deafd7b94c9f5001e. --- .../wasm/Wasm.Build.Tests/data/nuget8.config | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/mono/wasm/Wasm.Build.Tests/data/nuget8.config diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config deleted file mode 100644 index 05a36085b3ad5..0000000000000 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - From 5770b7a70bdf1e57d5f442b2d0b2c43bb47b6127 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:55:49 +0000 Subject: [PATCH 23/39] Revert "[wasm] Use the latest sdk for Wasm.Build.Tests" This reverts commit 3a15bdf787af5a75bf07b9f8afcea3d77b010870. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e77bcd88bc975..c5cd15c020bfe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 2.45.0 2.45.0 - + 8.0.100-alpha.1.22463.23 1.1.2-beta1.22403.2 7.0.0-preview-20220920.1 From dfc3398ebf455d85759f5b6ae5590caeea99abdd Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:55:51 +0000 Subject: [PATCH 24/39] Revert "Don't use the nuget packages directory as fallback." This reverts commit 785504e474f7fd3fc6c07027e59edf1c476844a1. --- src/mono/wasm/Wasm.Build.Tests/data/nuget7.config | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config index b3c73930eb16a..ebbacefcdf226 100644 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config @@ -3,6 +3,7 @@ + From 37030c31dfc70eecdd861e18601b4630b029031f Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:55:52 +0000 Subject: [PATCH 25/39] Revert "WasmAppHost: allow rollForward to work with newer sdks" This reverts commit 28cfbcd190b09c9b0f7f6046e91ef4eeffac5b71. --- src/mono/wasm/host/WasmAppHost.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mono/wasm/host/WasmAppHost.csproj b/src/mono/wasm/host/WasmAppHost.csproj index 8a32ea3332d14..56eef3ea418bf 100644 --- a/src/mono/wasm/host/WasmAppHost.csproj +++ b/src/mono/wasm/host/WasmAppHost.csproj @@ -6,7 +6,6 @@ $(NoWarn),CA2007 enable false - LatestMajor From 63a43b8f0dbe063b6d4462a7f5090df6a800472d Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:55:54 +0000 Subject: [PATCH 26/39] Revert "PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time" This reverts commit 33dbf9892500e2a6375728f0b5c5eea062dd65bc. --- .../Wasm.Build.Tests/PInvokeTableGeneratorTests.cs | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs index 4c42a30373f09..adc68a3e23dc0 100644 --- a/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs @@ -462,21 +462,9 @@ public static void Main() """; - string tasksDir = Path.Combine(s_buildEnv.WorkloadPacksDir, - "Microsoft.NET.Runtime.WebAssembly.Sdk", - s_buildEnv.GetRuntimePackVersion(DefaultTargetFramework), - "tasks"); - if (!Directory.Exists(tasksDir)) - throw new DirectoryNotFoundException($"Could not find tasks directory {tasksDir}"); - - string? taskPath = Directory.EnumerateFiles(tasksDir, "WasmAppBuilder.dll", SearchOption.AllDirectories) - .FirstOrDefault(); - if (string.IsNullOrEmpty(taskPath)) - throw new FileNotFoundException($"Could not find WasmAppBuilder.dll in {tasksDir}"); - projectCode = projectCode .Replace("###WasmPInvokeModule###", AddAssembly("System.Private.CoreLib") + AddAssembly("System.Runtime") + AddAssembly(libraryBuildArgs.ProjectName)) - .Replace("###WasmAppBuilder###", taskPath); + .Replace("###WasmAppBuilder###", Path.Combine(s_buildEnv.WorkloadPacksDir, "Microsoft.NET.Runtime.WebAssembly.Sdk", s_buildEnv.GetRuntimePackVersion(), "tasks", DefaultTargetFramework, "WasmAppBuilder.dll")); buildArgs = buildArgs with { ProjectName = $"icall_enum_{buildArgs.Config}_{id}", ProjectFileContents = projectCode }; From 8b7a67137bf8587cdc98901ed2c6c3d4a9dcbd18 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:55:55 +0000 Subject: [PATCH 27/39] Revert "[wasm] fix weird build failures" This reverts commit 1a731fb70c36b227359012fbceb622623b768d79. --- src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs | 1 + src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs | 3 --- src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs | 13 ------------- src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs | 3 --- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs index de8c14b30495b..62f7cc4d762ba 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs @@ -107,6 +107,7 @@ public BuildEnvironment() EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath; EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0"; EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; + EnvVars["MSBuildSDKsPath"] = string.Empty; EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}"; EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1"; diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index 7847c95cfc374..d6b4d26f3532e 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -840,9 +840,6 @@ public static (int exitCode, string buildOutput) RunProcess(string path, processStartInfo.EnvironmentVariables[envVar.Key] = envVar.Value; _testOutput.WriteLine($"\t{envVar.Key} = {envVar.Value}"); } - - // runtime repo sets this, which interferes with the tests - processStartInfo.RemoveEnvironmentVariables("MSBuildSDKsPath"); } Process process = new (); diff --git a/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs b/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs index 7f36db407e2dd..11710c3bd1bea 100644 --- a/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs +++ b/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs @@ -120,18 +120,5 @@ public static void UpdateTo(this IDictionary string.Compare(k, name, StringComparison.OrdinalIgnoreCase) == 0); - if (key is not null) - env.Remove("MSBuildSDKsPath"); - } - - return psi; - } } } diff --git a/src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs b/src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs index 2fae80aa4bdd3..a3438f707c4d2 100644 --- a/src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs +++ b/src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs @@ -161,8 +161,6 @@ private Process CreateProcess(string executable, string args) psi.Environment["DOTNET_MULTILEVEL_LOOKUP"] = "0"; psi.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; - // runtime repo sets this, which interferes with the tests - psi.RemoveEnvironmentVariables("MSBuildSDKsPath"); AddEnvironmentVariablesTo(psi); AddWorkingDirectoryTo(psi); var process = new Process @@ -203,7 +201,6 @@ private void AddEnvironmentVariablesTo(ProcessStartInfo psi) { foreach (var item in Environment) { - _testOutput.WriteLine($"\t[{item.Key}] = {item.Value}"); psi.Environment[item.Key] = item.Value; } } From 208afcd8b4adc058372d7f68557b053305075f5a Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:55:59 +0000 Subject: [PATCH 28/39] Revert "Revert to test projects created in bindir, instead of a temp one" This reverts commit 57ff0dd4883469f5fa39b158017f48b1c101c338. --- src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs | 2 +- src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs index 62f7cc4d762ba..fa54ea29d24f6 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs @@ -27,7 +27,7 @@ public class BuildEnvironment public static readonly string RelativeTestAssetsPath = @"..\testassets\"; public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets"); public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data"); - public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt"); + public static readonly string TmpPath = Path.Combine(Path.GetTempPath(), "wasmbuildtests"); private static readonly Dictionary s_runtimePackVersions = new(); diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index d6b4d26f3532e..fefb56c67029c 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -281,7 +281,7 @@ protected static string RunWithXHarness(string testCommand, string testLogPath, protected void InitPaths(string id) { if (_projectDir == null) - _projectDir = Path.Combine(BuildEnvironment.TmpPath, id); + _projectDir = Path.Combine(AppContext.BaseDirectory, id); _logPath = Path.Combine(s_buildEnv.LogRootPath, id); _nugetPackagesDir = Path.Combine(BuildEnvironment.TmpPath, "nuget", id); @@ -466,7 +466,7 @@ private static string GetNuGetConfigWithLocalPackagesPath(string templatePath, s public string CreateWasmTemplateProject(string id, string template = "wasmbrowser", string extraArgs = "") { InitPaths(id); - InitProjectDir(_projectDir, addNuGetSourceForLocalPackages: true); + InitProjectDir(id, addNuGetSourceForLocalPackages: true); File.WriteAllText(Path.Combine(_projectDir, "Directory.Build.props"), ""); File.WriteAllText(Path.Combine(_projectDir, "Directory.Build.targets"), From 454a7c2090cde679fb466f77d3ca08f50fc7a58c Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:56:00 +0000 Subject: [PATCH 29/39] Revert "[wasm] WBT: Fixes to work with latest sdk" This reverts commit 0aa1b5a9813d3815754e9f9fd201044c33e7b31c. --- .../BlazorWasmBuildPublishTests.cs | 2 +- .../wasm/Wasm.Build.Tests/BuildEnvironment.cs | 3 + .../wasm/Wasm.Build.Tests/BuildTestBase.cs | 68 +++++++------------ src/mono/wasm/Wasm.Build.Tests/CleanTests.cs | 4 +- .../wasm/Wasm.Build.Tests/HelperExtensions.cs | 3 +- .../NoopNativeRebuildTest.cs | 4 +- .../PInvokeTableGeneratorTests.cs | 1 - .../Wasm.Build.Tests/WasmTemplateTests.cs | 12 ++-- .../data/Blazor.Local.Directory.Build.props | 1 + .../data/Blazor.Local.Directory.Build.targets | 5 ++ .../wasm/Wasm.Build.Tests/data/nuget7.config | 3 - 11 files changed, 45 insertions(+), 61 deletions(-) create mode 100644 src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props create mode 100644 src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets diff --git a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs index 015a45dd4fa2c..39f7dfba8587f 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs @@ -94,7 +94,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel var expectedFileType = nativeRelink ? NativeFilesType.Relinked : NativeFilesType.AOT; - AssertDotNetNativeFiles(expectedFileType, config, forPublish: true, targetFramework: DefaultTargetFrameworkForBlazor); + AssertDotNetNativeFiles(expectedFileType, config, forPublish: true); AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: false); if (expectedFileType == NativeFilesType.AOT) diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs index fa54ea29d24f6..f921b87037573 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs @@ -160,5 +160,8 @@ public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramew protected static string s_directoryBuildPropsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.props")); protected static string s_directoryBuildTargetsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.targets")); + + protected static string s_directoryBuildPropsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.props")); + protected static string s_directoryBuildTargetsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.targets")); } } diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index fefb56c67029c..d427f1d1f348d 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -28,7 +28,7 @@ namespace Wasm.Build.Tests public abstract class BuildTestBase : IClassFixture, IDisposable { public const string DefaultTargetFramework = "net7.0"; - public const string DefaultTargetFrameworkForBlazor = "net7.0"; + public static readonly string NuGetConfigFileNameForDefaultFramework = $"nuget7.config"; protected static readonly bool s_skipProjectCleanup; protected static readonly string s_xharnessRunnerCommand; protected string? _projectDir; @@ -49,9 +49,6 @@ public abstract class BuildTestBase : IClassFixture s_buildEnv.IsWorkload; public static bool IsNotUsingWorkloads => !s_buildEnv.IsWorkload; - public static string GetNuGetConfigPathFor(string targetFramework) => - Path.Combine(BuildEnvironment.TestDataPath, "nuget8.config"); // for now - we are still using net7, but with - // targetFramework == "net7.0" ? "nuget7.config" : "nuget8.config"); static BuildTestBase() { @@ -292,7 +289,7 @@ protected void InitPaths(string id) Directory.CreateDirectory(_logPath); } - protected void InitProjectDir(string dir, bool addNuGetSourceForLocalPackages = false, string targetFramework = DefaultTargetFramework) + protected static void InitProjectDir(string dir, bool addNuGetSourceForLocalPackages = false) { Directory.CreateDirectory(dir); File.WriteAllText(Path.Combine(dir, "Directory.Build.props"), s_buildEnv.DirectoryBuildPropsContents); @@ -303,13 +300,15 @@ protected void InitProjectDir(string dir, bool addNuGetSourceForLocalPackages = { File.WriteAllText(targetNuGetConfigPath, GetNuGetConfigWithLocalPackagesPath( - GetNuGetConfigPathFor(targetFramework), + Path.Combine(BuildEnvironment.TestDataPath, NuGetConfigFileNameForDefaultFramework), s_buildEnv.BuiltNuGetsPath)); } else { - File.Copy(GetNuGetConfigPathFor(targetFramework), targetNuGetConfigPath); + File.Copy(Path.Combine(BuildEnvironment.TestDataPath, NuGetConfigFileNameForDefaultFramework), + targetNuGetConfigPath); } + Directory.CreateDirectory(Path.Combine(dir, ".nuget")); } protected const string SimpleProjectTemplate = @@ -415,14 +414,7 @@ protected static BuildArgs ExpandBuildArgs(BuildArgs buildArgs, string extraProp AssertRuntimePackPath(result.buildOutput, options.TargetFramework ?? DefaultTargetFramework); string bundleDir = Path.Combine(GetBinDir(config: buildArgs.Config, targetFramework: options.TargetFramework ?? DefaultTargetFramework), "AppBundle"); - AssertBasicAppBundle(bundleDir, - buildArgs.ProjectName, - buildArgs.Config, - options.MainJS ?? "test-main.js", - options.HasV8Script, - options.TargetFramework ?? DefaultTargetFramework, - options.HasIcudt, - options.DotnetWasmFromRuntimePack ?? !buildArgs.AOT); + AssertBasicAppBundle(bundleDir, buildArgs.ProjectName, buildArgs.Config, options.MainJS ?? "test-main.js", options.HasV8Script, options.HasIcudt, options.DotnetWasmFromRuntimePack ?? !buildArgs.AOT, options.TargetFramework ?? DefaultTargetFramework); } if (options.UseCache) @@ -438,16 +430,17 @@ protected static BuildArgs ExpandBuildArgs(BuildArgs buildArgs, string extraProp } } - public void InitBlazorWasmProjectDir(string id, string targetFramework = DefaultTargetFrameworkForBlazor) + public void InitBlazorWasmProjectDir(string id) { InitPaths(id); if (Directory.Exists(_projectDir)) Directory.Delete(_projectDir, recursive: true); Directory.CreateDirectory(_projectDir); + Directory.CreateDirectory(Path.Combine(_projectDir, ".nuget")); File.WriteAllText(Path.Combine(_projectDir, "nuget.config"), GetNuGetConfigWithLocalPackagesPath( - GetNuGetConfigPathFor(targetFramework), + Path.Combine(BuildEnvironment.TestDataPath, NuGetConfigFileNameForDefaultFramework), s_buildEnv.BuiltNuGetsPath)); File.Copy(Path.Combine(BuildEnvironment.TestDataPath, "Blazor.Directory.Build.props"), Path.Combine(_projectDir, "Directory.Build.props")); @@ -504,12 +497,8 @@ public string CreateBlazorWasmTemplateProject(string id) protected (CommandResult, string) BlazorBuild(BlazorBuildOptions options, params string[] extraArgs) { var res = BuildInternal(options.Id, options.Config, publish: false, setWasmDevel: false, extraArgs); - _testOutput.WriteLine($"BlazorBuild, options.tfm: {options.TargetFramework}"); AssertDotNetNativeFiles(options.ExpectedFileType, options.Config, forPublish: false, targetFramework: options.TargetFramework); - AssertBlazorBundle(options.Config, - isPublish: false, - dotnetWasmFromRuntimePack: options.ExpectedFileType == NativeFilesType.FromRuntimePack, - targetFramework: options.TargetFramework); + AssertBlazorBundle(options.Config, isPublish: false, dotnetWasmFromRuntimePack: options.ExpectedFileType == NativeFilesType.FromRuntimePack); return res; } @@ -518,10 +507,7 @@ public string CreateBlazorWasmTemplateProject(string id) { var res = BuildInternal(options.Id, options.Config, publish: true, setWasmDevel: false, extraArgs); AssertDotNetNativeFiles(options.ExpectedFileType, options.Config, forPublish: true, targetFramework: options.TargetFramework); - AssertBlazorBundle(options.Config, - isPublish: true, - dotnetWasmFromRuntimePack: options.ExpectedFileType == NativeFilesType.FromRuntimePack, - targetFramework: options.TargetFramework); + AssertBlazorBundle(options.Config, isPublish: true, dotnetWasmFromRuntimePack: options.ExpectedFileType == NativeFilesType.FromRuntimePack); if (options.ExpectedFileType == NativeFilesType.AOT) { @@ -553,18 +539,17 @@ public string CreateBlazorWasmTemplateProject(string id) CommandResult res = new DotNetCommand(s_buildEnv, _testOutput) .WithWorkingDirectory(_projectDir!) - .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir) .ExecuteWithCapturedOutput(combinedArgs) .EnsureSuccessful(); return (res, logPath); } - protected void AssertDotNetNativeFiles(NativeFilesType type, string config, bool forPublish, string targetFramework) + protected void AssertDotNetNativeFiles(NativeFilesType type, string config, bool forPublish, string targetFramework = DefaultTargetFramework) { string label = forPublish ? "publish" : "build"; string objBuildDir = Path.Combine(_projectDir!, "obj", config, targetFramework, "wasm", forPublish ? "for-publish" : "for-build"); - string binFrameworkDir = FindBlazorBinFrameworkDir(config, forPublish, framework: targetFramework); + string binFrameworkDir = FindBlazorBinFrameworkDir(config, forPublish); string srcDir = type switch { @@ -605,14 +590,7 @@ static void AssertRuntimePackPath(string buildOutput, string targetFramework) throw new XunitException($"Runtime pack path doesn't match.{Environment.NewLine}Expected: '{expectedRuntimePackDir}'{Environment.NewLine}Actual: '{actualPath}'"); } - protected static void AssertBasicAppBundle(string bundleDir, - string projectName, - string config, - string mainJS, - bool hasV8Script, - string targetFramework, - bool hasIcudt = true, - bool dotnetWasmFromRuntimePack = true) + protected static void AssertBasicAppBundle(string bundleDir, string projectName, string config, string mainJS, bool hasV8Script, bool hasIcudt=true, bool dotnetWasmFromRuntimePack=true, string targetFramework=DefaultTargetFramework) { AssertFilesExist(bundleDir, new [] { @@ -660,7 +638,7 @@ protected static void AssertDotNetWasmJs(string bundleDir, bool fromRuntimePack, same: fromRuntimePack); } - protected static void AssertDotNetJsSymbols(string bundleDir, bool fromRuntimePack, string targetFramework) + protected static void AssertDotNetJsSymbols(string bundleDir, bool fromRuntimePack, string targetFramework=DefaultTargetFramework) => AssertFile(Path.Combine(s_buildEnv.GetRuntimeNativeDir(targetFramework), "dotnet.js.symbols"), Path.Combine(bundleDir, "dotnet.js.symbols"), same: fromRuntimePack); @@ -712,11 +690,11 @@ protected static void AssertFile(string file0, string file1, string? label=null, return result; } - protected void AssertBlazorBundle(string config, bool isPublish, bool dotnetWasmFromRuntimePack, string targetFramework = DefaultTargetFrameworkForBlazor, string? binFrameworkDir=null) + protected void AssertBlazorBundle(string config, bool isPublish, bool dotnetWasmFromRuntimePack, string? binFrameworkDir=null, string targetFramework=DefaultTargetFramework) { - binFrameworkDir ??= FindBlazorBinFrameworkDir(config, isPublish, targetFramework); + binFrameworkDir ??= FindBlazorBinFrameworkDir(config, isPublish); - AssertBlazorBootJson(config, isPublish, targetFramework, binFrameworkDir: binFrameworkDir); + AssertBlazorBootJson(config, isPublish, binFrameworkDir: binFrameworkDir); AssertFile(Path.Combine(s_buildEnv.GetRuntimeNativeDir(targetFramework), "dotnet.wasm"), Path.Combine(binFrameworkDir, "dotnet.wasm"), "Expected dotnet.wasm to be same as the runtime pack", @@ -731,9 +709,9 @@ protected void AssertBlazorBundle(string config, bool isPublish, bool dotnetWasm same: dotnetWasmFromRuntimePack); } - protected void AssertBlazorBootJson(string config, bool isPublish, string targetFramework = DefaultTargetFrameworkForBlazor, string? binFrameworkDir=null) + protected void AssertBlazorBootJson(string config, bool isPublish, string? binFrameworkDir=null) { - binFrameworkDir ??= FindBlazorBinFrameworkDir(config, isPublish, targetFramework); + binFrameworkDir ??= FindBlazorBinFrameworkDir(config, isPublish); string bootJsonPath = Path.Combine(binFrameworkDir, "blazor.boot.json"); Assert.True(File.Exists(bootJsonPath), $"Expected to find {bootJsonPath}"); @@ -750,7 +728,7 @@ protected void AssertBlazorBootJson(string config, bool isPublish, string target $"{msgPrefix} Could not find dotnet.*js in {bootJson}"); } - protected string FindBlazorBinFrameworkDir(string config, bool forPublish, string framework = DefaultTargetFrameworkForBlazor) + protected string FindBlazorBinFrameworkDir(string config, bool forPublish, string framework = DefaultTargetFramework) { string basePath = Path.Combine(_projectDir!, "bin", config, framework); if (forPublish) @@ -1027,6 +1005,6 @@ public record BlazorBuildOptions string Id, string Config, NativeFilesType ExpectedFileType, - string TargetFramework = BuildTestBase.DefaultTargetFrameworkForBlazor + string TargetFramework = BuildTestBase.DefaultTargetFramework ); } diff --git a/src/mono/wasm/Wasm.Build.Tests/CleanTests.cs b/src/mono/wasm/Wasm.Build.Tests/CleanTests.cs index b113c8443631d..6be1a736ce140 100644 --- a/src/mono/wasm/Wasm.Build.Tests/CleanTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/CleanTests.cs @@ -36,7 +36,7 @@ public void Blazor_BuildThenClean_NativeRelinking(string config) AddItemsPropertiesToProject(projectFile, extraProperties: extraProperties); BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked)); - string relinkDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFrameworkForBlazor, "wasm", "for-build"); + string relinkDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm", "for-build"); Assert.True(Directory.Exists(relinkDir), $"Could not find expected relink dir: {relinkDir}"); string logPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-clean.binlog"); @@ -76,7 +76,7 @@ private void Blazor_BuildNativeNonNative_ThenCleanTest(string config, bool first BuildInternal(id, config, publish: false, extraArgs: relink ? "-p:WasmBuildNative=true" : string.Empty); - string relinkDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFrameworkForBlazor, "wasm", "for-build"); + string relinkDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm", "for-build"); if (relink) Assert.True(Directory.Exists(relinkDir), $"Could not find expected relink dir: {relinkDir}"); diff --git a/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs b/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs index 11710c3bd1bea..c20aa25a5c43a 100644 --- a/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs +++ b/src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs @@ -5,8 +5,9 @@ using System.Collections.Generic; using System.Linq; using System.IO; -using System.Diagnostics; using System.Text; +using System.Collections; +using Xunit.Abstractions; #nullable enable diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs index e5f17d261811a..1359202b698fd 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs @@ -44,7 +44,7 @@ public void BlazorNoopRebuild(string config) string projectFile = CreateBlazorWasmTemplateProject(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); - string objDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFrameworkForBlazor, "wasm"); + string objDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm"); BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked)); File.Move(Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build.binlog"), @@ -71,7 +71,7 @@ public void BlazorOnlyLinkRebuild(string config) string projectFile = CreateBlazorWasmTemplateProject(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); - string objDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFrameworkForBlazor, "wasm"); + string objDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm"); BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked), "-p:EmccLinkOptimizationFlag=-O2"); File.Move(Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build.binlog"), diff --git a/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs index adc68a3e23dc0..0d7d58b8c24d2 100644 --- a/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; -using System.Linq; using Xunit; using Xunit.Abstractions; diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs index 2103a455b6f76..cd1500b6619d5 100644 --- a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs @@ -102,7 +102,7 @@ public void BrowserBuildThenPublish(string config) TargetFramework: BuildTestBase.DefaultTargetFramework )); - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: true, targetFramework: DefaultTargetFramework); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: true); if (!_buildContext.TryGetBuildFor(buildArgs, out BuildProduct? product)) throw new XunitException($"Test bug: could not get the build product in the cache"); @@ -123,7 +123,7 @@ public void BrowserBuildThenPublish(string config) TargetFramework: BuildTestBase.DefaultTargetFramework, UseCache: false)); - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking, targetFramework: DefaultTargetFramework); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking); } [Theory] @@ -151,7 +151,7 @@ public void ConsoleBuildThenPublish(string config) TargetFramework: BuildTestBase.DefaultTargetFramework )); - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: true, targetFramework: DefaultTargetFramework); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: true); (int exitCode, string output) = RunProcess(s_buildEnv.DotNet, _testOutput, args: $"run --no-build -c {config}", workingDir: _projectDir); Assert.Equal(0, exitCode); @@ -176,7 +176,7 @@ public void ConsoleBuildThenPublish(string config) TargetFramework: BuildTestBase.DefaultTargetFramework, UseCache: false)); - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking, targetFramework: DefaultTargetFramework); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking); } [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))] @@ -218,7 +218,7 @@ private void ConsoleBuildAndRun(string config, bool relinking, string extraNewAr TargetFramework: BuildTestBase.DefaultTargetFramework )); - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !relinking, targetFramework: DefaultTargetFramework); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !relinking); (int exitCode, string output) = RunProcess(s_buildEnv.DotNet, _testOutput, args: $"run --no-build -c {config} x y z", workingDir: _projectDir); Assert.Equal(42, exitCode); @@ -392,7 +392,7 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking) if (!aot) { // These are disabled for AOT explicitly - AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking, targetFramework: DefaultTargetFramework); + AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking); } else { diff --git a/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props b/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props new file mode 100644 index 0000000000000..058246e408620 --- /dev/null +++ b/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.props @@ -0,0 +1 @@ + diff --git a/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets b/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets new file mode 100644 index 0000000000000..6f9b3ab9ef999 --- /dev/null +++ b/src/mono/wasm/Wasm.Build.Tests/data/Blazor.Local.Directory.Build.targets @@ -0,0 +1,5 @@ + + + + + diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config index ebbacefcdf226..e7ad45f78b8ca 100644 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config @@ -8,9 +8,6 @@ - - - From c263ad7f4804db7b678982bdfda1291b6b18fb13 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:56:02 +0000 Subject: [PATCH 30/39] Revert "[wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project directory" This reverts commit 0678940b38ccb2f10509bc6b5e674ba67cb4de10. --- .../BlazorWasmBuildPublishTests.cs | 2 -- src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs | 2 -- src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs | 15 +++++++-------- src/mono/wasm/Wasm.Build.Tests/CleanTests.cs | 2 -- .../wasm/Wasm.Build.Tests/NativeBuildTests.cs | 1 - src/mono/wasm/Wasm.Build.Tests/RunCommand.cs | 1 - src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs | 2 +- 7 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs index 39f7dfba8587f..a3f250b462394 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs @@ -241,7 +241,6 @@ public void BugRegression_60479_WithRazorClassLib() Directory.CreateDirectory(wasmProjectDir); new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false) .WithWorkingDirectory(wasmProjectDir) - .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir) .ExecuteWithCapturedOutput("new blazorwasm") .EnsureSuccessful(); @@ -250,7 +249,6 @@ public void BugRegression_60479_WithRazorClassLib() Directory.CreateDirectory(razorProjectDir); new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false) .WithWorkingDirectory(razorProjectDir) - .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir) .ExecuteWithCapturedOutput("new razorclasslib") .EnsureSuccessful(); diff --git a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs index 91cf6c23156fe..cfb725bd59f22 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs @@ -61,7 +61,6 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra string publishLogPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}.binlog"); return new DotNetCommand(s_buildEnv, _testOutput) .WithWorkingDirectory(_projectDir!) - .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir) .ExecuteWithCapturedOutput("publish", $"-bl:{publishLogPath}", $"-p:Configuration={config}"); @@ -110,7 +109,6 @@ private void BuildNet50Project(string config, bool aot, bool expectError, string string publishLogPath = Path.Combine(logPath, $"{id}.binlog"); CommandResult result = new DotNetCommand(s_buildEnv, _testOutput) .WithWorkingDirectory(_projectDir!) - .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir) .ExecuteWithCapturedOutput("publish", $"-bl:{publishLogPath}", (aot ? "-p:RunAOTCompilation=true" : ""), diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index d427f1d1f348d..f4a73bdbb0fe5 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -36,7 +36,6 @@ public abstract class BuildTestBase : IClassFixture ExecuteAsync(params string[] args) { var resolvedCommand = _command; string fullArgs = GetFullArgs(args); - _testOutput.WriteLine($"[{_label}] Executing - {resolvedCommand} {fullArgs} {WorkingDirectoryInfo()}"); + _testOutput.WriteLine($"[{_label}] Executing - {resolvedCommand} {fullArgs} - {WorkingDirectoryInfo()}"); return await ExecuteAsyncInternal(resolvedCommand, fullArgs); } From c484e5a0be5ee3cc02817841c54c7cf831ef9b49 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:56:04 +0000 Subject: [PATCH 31/39] Revert "[wasm] WBT: Make project names unique" This reverts commit 55120ac60c3b53bdadd7f8a2348abe33c9db037b. --- .../BlazorWasmBuildPublishTests.cs | 18 +++++++++--------- .../wasm/Wasm.Build.Tests/NativeBuildTests.cs | 2 +- .../NoopNativeRebuildTest.cs | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs index a3f250b462394..8123c9cfc1c9e 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs @@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC [InlineData("Release")] public void DefaultTemplate_WithoutWorkload(string config) { - string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}"; + string id = $"blz_no_workload_{config}"; CreateBlazorWasmTemplateProject(id); // Build @@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config) [InlineData("Release")] public void DefaultTemplate_NoAOT_WithWorkload(string config) { - string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}"; + string id = $"blz_no_aot_{config}"; CreateBlazorWasmTemplateProject(id); BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack)); @@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config) [InlineData("Release")] public void DefaultTemplate_AOT_InProjectFile(string config) { - string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}"; + string id = $"blz_aot_prj_file_{config}"; string projectFile = CreateBlazorWasmTemplateProject(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); @@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config) [InlineData("Debug", false)] [InlineData("Release", true)] [InlineData("Release", false)] - //[ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)] public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRelink) { - string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}"; + string id = $"blz_deploy_on_build_{config}_{nativeRelink}"; string projectFile = CreateProjectWithNativeReference(id); AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "true"); @@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)] public void WithNativeReference_AOTInProjectFile(string config) { - string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}"; + string id = $"blz_nativeref_aot_{config}"; string projectFile = CreateProjectWithNativeReference(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); @@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config) [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)] public void WithNativeReference_AOTOnCommandLine(string config) { - string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}"; + string id = $"blz_nativeref_aot_{config}"; CreateProjectWithNativeReference(id); BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked)); @@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config) public void WithDllImportInMainAssembly(string config) { // Based on https://github.com/dotnet/runtime/issues/59255 - string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}"; + string id = $"blz_dllimp_{config}"; string projectFile = CreateProjectWithNativeReference(id); string nativeSource = @" #include @@ -233,7 +233,7 @@ void CheckNativeFileLinked(bool forPublish) [Fact] public void BugRegression_60479_WithRazorClassLib() { - string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}"; + string id = "blz_razor_lib_top"; InitBlazorWasmProjectDir(id); string wasmProjectDir = Path.Combine(_projectDir!, "wasm"); diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs b/src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs index 9c8b7c03204f9..17d140f9a562f 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs @@ -106,7 +106,7 @@ public void IntermediateBitcodeToObjectFilesAreNotLLVMIR(BuildArgs buildArgs, st [InlineData("Release")] public void BlazorWasm_CanRunMonoAOTCross_WithNoTrimming(string config) { - string id = $"blazorwasm_{config}_aot_{Path.GetRandomFileName()}"; + string id = $"blazorwasm_{config}_aot"; CreateBlazorWasmTemplateProject(id); // We don't want to emcc compile, and link ~180 assemblies! diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs index 1359202b698fd..1cc525391ad77 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs @@ -40,7 +40,7 @@ public void NoOpRebuildForNativeBuilds(BuildArgs buildArgs, bool nativeRelink, b [InlineData("Release")] public void BlazorNoopRebuild(string config) { - string id = $"blz_rebuild_{config}_{Path.GetRandomFileName()}"; + string id = $"blz_rebuild_{config}"; string projectFile = CreateBlazorWasmTemplateProject(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); @@ -67,7 +67,7 @@ public void BlazorNoopRebuild(string config) [InlineData("Release")] public void BlazorOnlyLinkRebuild(string config) { - string id = $"blz_relink_{config}_{Path.GetRandomFileName()}"; + string id = $"blz_relink_{config}"; string projectFile = CreateBlazorWasmTemplateProject(id); AddItemsPropertiesToProject(projectFile, extraProperties: "true"); From cb9e7a60fec2de1bc51c7542d83037290023a99e Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 15:56:07 +0000 Subject: [PATCH 32/39] Revert "InstallWorkloadFromArtifacts: Remove hack because we have an updated sdk now" This reverts commit 60e9f8c1a938c4fc0dab2a66fcc8d8af579ffd98. --- .../InstallWorkloadFromArtifacts.cs | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index e0f420941785c..94e255df990ed 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -41,6 +41,14 @@ public class InstallWorkloadFromArtifacts : Task private const string s_nugetInsertionTag = ""; private string AllManifestsStampPath => Path.Combine(SdkWithNoWorkloadInstalledPath, ".all-manifests.stamp"); + private static readonly string[] s_manifestIds = new[] + { + "microsoft.net.workload.mono.toolchain", + "microsoft.net.workload.emscripten.net6", + "microsoft.net.workload.emscripten.net7", + "microsoft.net.workload.mono.toolchain.net6", + "microsoft.net.workload.mono.toolchain.net7" + }; public override bool Execute() { @@ -146,6 +154,8 @@ private bool InstallAllManifests() return true; } + ExecuteHackForInstallerMismatch(); + string nugetConfigContents = GetNuGetConfig(); HashSet manifestsInstalled = new(); foreach (ITaskItem workload in WorkloadIds) @@ -175,6 +185,43 @@ private bool InstallAllManifests() File.WriteAllText(AllManifestsStampPath, string.Empty); return true; + + void ExecuteHackForInstallerMismatch() + { + // HACK - because sdk doesn't yet have the version-less manifest names in the known + // workloads list + string? txtPath = Directory.EnumerateFiles(Path.Combine(SdkWithNoWorkloadInstalledPath, "sdk"), "IncludedWorkloadManifests.txt", + new EnumerationOptions { RecurseSubdirectories = true, MaxRecursionDepth = 2}) + .FirstOrDefault(); + if (txtPath is null) + throw new LogAsErrorException($"Could not find IncludedWorkloadManifests.txt in {SdkWithNoWorkloadInstalledPath}"); + + string stampPath = Path.Combine(Path.GetDirectoryName(txtPath)!, ".stamp"); + if (File.Exists(stampPath)) + return; + + List lines = File.ReadAllLines(txtPath).ToList(); + int originalCount = lines.Count; + + // we want to insert the manifests in a fixed order + // so first remove all of them + foreach (string manifestId in s_manifestIds) + lines.Remove(manifestId); + // .. and then insert + lines.AddRange(s_manifestIds); + + // currently using emscripten.net7 instead of this, + // so remove it from the list + lines.Remove("microsoft.net.workload.emscripten"); + + if (lines.Count != originalCount) + { + // Update the file only if we are making any changes + File.WriteAllText(txtPath, string.Join(Environment.NewLine, lines)); + } + + File.WriteAllText(stampPath, ""); + } } private bool InstallPacks(InstallWorkloadRequest req, string nugetConfigContents) From 5dcce55dfab1844230872d6793cdb457b7785225 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 13:40:21 +0000 Subject: [PATCH 33/39] Fix Wasm.Build.Tests failures - Use latest sdk for testing - Add dotnet8 feed, needed by blazorwasm templates - Workaround a bug in 7.0 templates which will be fixed by https://github.com/dotnet/runtime/pull/76373 . And this can be removed once we have packages with that. --- eng/Versions.props | 2 +- .../wasm/Wasm.Build.Tests/WasmTemplateTests.cs | 16 +++++++++++++--- .../wasm/Wasm.Build.Tests/data/nuget7.config | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c5cd15c020bfe..e77bcd88bc975 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 2.45.0 2.45.0 - 8.0.100-alpha.1.22463.23 + 1.1.2-beta1.22403.2 7.0.0-preview-20220920.1 diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs index cd1500b6619d5..616faf2bdd626 100644 --- a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs @@ -222,9 +222,19 @@ private void ConsoleBuildAndRun(string config, bool relinking, string extraNewAr (int exitCode, string output) = RunProcess(s_buildEnv.DotNet, _testOutput, args: $"run --no-build -c {config} x y z", workingDir: _projectDir); Assert.Equal(42, exitCode); - Assert.Contains("args[0] = x", output); - Assert.Contains("args[1] = y", output); - Assert.Contains("args[2] = z", output); + if (extraNewArgs.Contains("-f net7.0")) + { + // Workaround for https://github.com/dotnet/runtime/issues/76201 + Assert.Contains("args[0] = dotnet", output); + Assert.Contains("args[1] = is", output); + Assert.Contains("args[2] = great!", output); + } + else + { + Assert.Contains("args[0] = x", output); + Assert.Contains("args[1] = y", output); + Assert.Contains("args[2] = z", output); + } } public static TheoryData TestDataForAppBundleDir() diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config index e7ad45f78b8ca..409ee96f0277b 100644 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config @@ -8,6 +8,7 @@ + From 4a8d824897773f1c31d2c13bc990d56ad768ac97 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 29 Sep 2022 11:20:22 +0000 Subject: [PATCH 34/39] WasmAppHost: Set rollForward=latestMajor to work with newer sdks --- src/mono/wasm/host/WasmAppHost.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mono/wasm/host/WasmAppHost.csproj b/src/mono/wasm/host/WasmAppHost.csproj index 56eef3ea418bf..8a32ea3332d14 100644 --- a/src/mono/wasm/host/WasmAppHost.csproj +++ b/src/mono/wasm/host/WasmAppHost.csproj @@ -6,6 +6,7 @@ $(NoWarn),CA2007 enable false + LatestMajor From 3d09873e01d05f57004ad9e43eedf5d4bc16f627 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 30 Sep 2022 12:13:04 +0000 Subject: [PATCH 35/39] Update dependencies from https://github.com/dotnet/arcade build 20220929.2 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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22479.2 --- eng/Version.Details.xml | 76 ++++++++++++++++---------------- eng/Versions.props | 32 +++++++------- eng/common/init-tools-native.ps1 | 1 + global.json | 6 +-- 4 files changed, 58 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec61b4d3221df..a27472027fc10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,77 +86,77 @@ - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f https://github.com/dotnet/runtime-assets @@ -274,9 +274,9 @@ https://github.com/dotnet/xharness a8e8fc0ffeb9b8c56ab799597597ce35d5be6111 - + https://github.com/dotnet/arcade - 839e1e3b415fc2747dde68f47d940faa414020ec + 53c19829c61fa652687e90075ec391f7610d506f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index e77bcd88bc975..639f9ee10bebe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,22 +57,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 2.5.1-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 - 8.0.0-beta.22478.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 2.5.1-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 + 8.0.0-beta.22479.2 6.0.0-preview.1.102 diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index ac42f04a9d827..fbc67effc3631 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -113,6 +113,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/global.json b/global.json index 250ea4ad695fc..35efc724e3fff 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22478.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22478.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22478.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22479.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22479.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22479.2", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22475.4" From 1c2a84d2c409855d5720489d2e907a32ec1e75aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Oct 2022 12:12:53 +0000 Subject: [PATCH 36/39] Update dependencies from https://github.com/dotnet/arcade build 20220930.2 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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22480.2 --- eng/Version.Details.xml | 76 ++++++++++---------- eng/Versions.props | 32 ++++----- eng/common/templates/job/job.yml | 4 ++ eng/common/templates/steps/generate-sbom.yml | 4 ++ global.json | 6 +- 5 files changed, 65 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a27472027fc10..598d4b9a4c3d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,77 +86,77 @@ - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 https://github.com/dotnet/runtime-assets @@ -274,9 +274,9 @@ https://github.com/dotnet/xharness a8e8fc0ffeb9b8c56ab799597597ce35d5be6111 - + https://github.com/dotnet/arcade - 53c19829c61fa652687e90075ec391f7610d506f + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 639f9ee10bebe..2f0b63b83d3b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,22 +57,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 2.5.1-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 - 8.0.0-beta.22479.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 2.5.1-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 459f3c4fcbb99..9f55d3f466600 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -25,6 +25,7 @@ parameters: enablePublishTestResults: false enablePublishUsingPipelines: false disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -146,6 +147,8 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - task: ComponentGovernanceComponentDetection@0 continueOnError: true + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -223,4 +226,5 @@ jobs: parameters: PackageVersion: ${{ parameters.packageVersion}} BuildDropPath: ${{ parameters.buildDropPath }} + IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index 4cea8c33187c9..a06373f38fa5d 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -2,12 +2,14 @@ # PackageName - The name of the package this SBOM represents. # PackageVersion - The version of the package this SBOM represents. # ManifestDirPath - The path of the directory where the generated manifest files will be placed +# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: PackageVersion: 7.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + IgnoreDirectories: '' sbomContinueOnError: true steps: @@ -34,6 +36,8 @@ steps: BuildDropPath: ${{ parameters.buildDropPath }} PackageVersion: ${{ parameters.packageVersion }} ManifestDirPath: ${{ parameters.manifestDirPath }} + ${{ if ne(parameters.IgnoreDirectories, '') }}: + AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' - task: PublishPipelineArtifact@1 displayName: Publish SBOM manifest diff --git a/global.json b/global.json index 35efc724e3fff..cfb2eab45d44a 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22479.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22479.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22479.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22480.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22480.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22480.2", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22475.4" From 8e2cd6f9b3ee513681df96b0930d901dbde4cea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 3 Oct 2022 11:19:11 +0200 Subject: [PATCH 37/39] Revert changes to source-build.yml It was missing https://github.com/dotnet/arcade/pull/10782 --- eng/common/templates/steps/source-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 4ec5577d28a0c..a97a185a367a9 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -80,6 +85,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true \ /p:AssetManifestFileName=$assetManifestFileName From 6f5768e428b23e02376806b75086271768b4e4e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Oct 2022 12:05:50 +0000 Subject: [PATCH 38/39] Update dependencies from https://github.com/dotnet/arcade build 20220930.2 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 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22480.2 --- eng/common/templates/steps/source-build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index a97a185a367a9..4ec5577d28a0c 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,11 +63,6 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi - runtimeOsArgs= - if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then - runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' - fi - publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -85,7 +80,6 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ - $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true \ /p:AssetManifestFileName=$assetManifestFileName From 98c57bf1c489663941fedc5e073e460aa0514ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 3 Oct 2022 14:19:27 +0200 Subject: [PATCH 39/39] Revert changes again --- eng/common/templates/steps/source-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 4ec5577d28a0c..a97a185a367a9 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -80,6 +85,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true \ /p:AssetManifestFileName=$assetManifestFileName