Remove host specific args from CommandLineArgs #68918

jaredpar · 2023-07-07T15:06:32Z

This changes our build tasks to remove the host specific args, namely the exec ...\csc.dll, from the CommandLineArgs property. That ITaskItem[] is meant for the IDE consumption and doesn't need host specific information.

As a part of fixing this bug I cleaned up a lot of unnecessary member inheritance in the build tasks. There were several virtual members where every implementation had the same code. Moved all that up to the base and cleaned up the comments to make the intent clearer.

closes #67102

jaredpar · 2023-07-07T18:58:04Z

@dotnet/roslyn-compiler PTAL

jaredpar · 2023-07-07T19:06:48Z

src/Compilers/Core/MSBuildTask/InteractiveCompiler.cs

@@ -184,60 +184,22 @@ public bool SkipInteractiveExecution

 #region Tool Members

- // See ManagedCompiler.cs on the logic of this property


The removes are just moved up into ManagedToolTask

jaredpar · 2023-07-07T19:06:55Z

src/Compilers/Core/MSBuildTask/ManagedCompiler.cs

@@ -477,15 +477,6 @@ public bool ReportIVTs

 #endregion

- // ToolExe delegates back to ToolName if the override is not


The removes are just moved up into ManagedToolTask

src/Compilers/Core/MSBuildTask/ManagedToolTask.cs

src/Compilers/Core/Portable/msbuild.complog

333fred · 2023-07-10T18:19:43Z

src/Compilers/Shared/RuntimeHostInfo.cs

+ // First check for an app host file and return that if it's available.
+ var appHostSuffix = PlatformInformation.IsWindows ? ".exe" : "";
+ var appFilePath = $"{toolFilePathWithoutExtension}{appHostSuffix}";
+ if (File.Exists(appFilePath))


JaredPar used File.Exists. Twice. Who stole your account? 😛

Yeah I'm a hypocrite ...

chsienki

LGTM modulo the .complog

jaredpar · 2023-07-10T20:00:56Z

@333fred, @chsienki: thanks, feedback addressed.

src/Compilers/Core/MSBuildTaskTests/VbcTests.cs

333fred

LGTM (commit 10), modulo the copy/paste issue Chris noticed.

Co-authored-by: Chris Sienkiewicz <chsienki@microsoft.com>

`Wasm.Build.Tests.WasmTemplateTests.RunWithDifferentAppBundleLocations` broke with the latest sdk: `/root/helix/work/workitem/e/dotnet-latest/sdk/8.0.100-preview.7.23362.1/Roslyn/Microsoft.CSharp.Core.targets(80,5): error MSB6004: The specified task executable location "/root/helix/work/workitem/e/dotnet-latest/dotnet/dotnet" is invalid.` This was because dotnet/roslyn#68918 changed to expect `DOTNET_ROOT` to be a directory instead of the exe path.

* [wasm] WBT: Fix breaking tests `Wasm.Build.Tests.WasmTemplateTests.RunWithDifferentAppBundleLocations` broke with the latest sdk: `/root/helix/work/workitem/e/dotnet-latest/sdk/8.0.100-preview.7.23362.1/Roslyn/Microsoft.CSharp.Core.targets(80,5): error MSB6004: The specified task executable location "/root/helix/work/workitem/e/dotnet-latest/dotnet/dotnet" is invalid.` This was because dotnet/roslyn#68918 changed to expect `DOTNET_ROOT` to be a directory instead of the exe path. * [wasm] WBT: Set DOTNET_ROOT for tests * [wasm] WBT: Set DOTNET_ROOT explicitly in the helix environment The `NonWasmTemplateBuildTests` avoid using the default environment variables used for all other tests, which includes `DOTNET_ROOT`. Set `DOTNET_ROOT` explicitly in the helix setup script for windows, so we always have a fallback. ``` Wasm.Build.Tests.NonWasmTemplateBuildTests.NonWasmConsoleBuild_WithoutWorkload(config: "Debug", extraBuildArgs: "", targetFramework: "net6.0") [FAIL] Expected 0 exit code but got 1: C:\helix\work\workitem\e\dotnet-none\dotnet.exe build -restore -c Debug -bl:C:\helix\work\workitem\uploads\xharness-output\logs\nonwasm_net6.0_Debug_iyhtgmvj.uu4.binlog -f net6.0 Standard Output: [] MSBuild version 17.8.0-preview-23361-03+5ab64ed27 for .NET [] Determining projects to restore... [] Restored C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj (in 820 ms). [] Determining projects to restore... [] Restored C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj (in 11.21 sec). [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.RuntimeIdentifierInference.targets(314,5): message NETSDK1057: You are using a preview version of .NET. See: https://aka.ms/dotnet-support-policy [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : You must install or update .NET to run this application. [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : App: C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\bincore\csc.dll [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : Architecture: x64 [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : Framework: 'Microsoft.NETCore.App', version '8.0.0-preview.7.23361.9' (x64) [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : .NET location: C:\helix\work\correlation\dotnet-cli\ [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : The following frameworks were found: [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : 8.0.0-preview.5.23280.8 at [C:\helix\work\correlation\dotnet-cli\shared\Microsoft.NETCore.App] [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : Learn more: [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : https://aka.ms/dotnet/app-launch-failed [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : To install missing framework, download: [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : https://aka.ms/dotnet-core-applaunch?framework=Microsoft.NETCore.App&framework_version=8.0.0-preview.7.23361.9&arch=x64&rid=win10-x64 [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] ```

@eiriktsarpalis

* Update dependencies from https://github.com/dotnet/arcade build 20230629.1 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.23328.2 -> To Version 8.0.0-beta.23329.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23319.1 -> To Version 1.0.0-beta.23326.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20230630.3 Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-preview.7.23330.3 * Update dependencies from https://github.com/dotnet/llvm-project build 20230630.2 runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter From Version 14.0.0-alpha.1.23326.1 -> To Version 16.0.5-alpha.1.23330.2 * Update dependencies from https://github.com/dotnet/arcade build 20230630.1 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.23328.2 -> To Version 8.0.0-beta.23330.1 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 8.0.0-beta.23314.2 -> To Version 8.0.0-beta.23328.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20230630.15 Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-preview.7.23330.15 * Update dependencies from https://github.com/dotnet/runtime build 20230630.6 Microsoft.NET.ILLink.Tasks , Microsoft.NET.Sdk.IL , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , System.Text.Json From Version 8.0.0-preview.7.23325.2 -> To Version 8.0.0-preview.7.23330.6 * Update dependencies from https://github.com/dotnet/arcade build 20230703.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23328.2 -> To Version 8.0.0-beta.23353.2 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 8.0.0-beta.23314.2 -> To Version 8.0.0-beta.23330.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/icu build 20230703.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 8.0.0-preview.7.23326.2 -> To Version 8.0.0-preview.7.23353.1 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20230703.3 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 8.0.0-alpha.0.23326.2 -> To Version 8.0.0-alpha.0.23353.3 * Update dependencies from https://github.com/dotnet/sdk build 20230704.2 Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-preview.7.23354.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20230705.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 8.0.0-beta.23326.1 -> To Version 8.0.0-beta.23355.1 * Update dependencies from https://github.com/dotnet/emsdk build 20230705.1 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.7.23326.1 -> To Version 8.0.0-preview.7.23355.1 * Update dependencies from https://github.com/dotnet/sdk build 20230705.4 Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-preview.7.23355.4 * Update dependencies from https://github.com/dotnet/sdk build 20230706.6 Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-preview.7.23356.6 * Update dependencies from https://github.com/dotnet/arcade build 20230706.1 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.23328.2 -> To Version 8.0.0-beta.23356.1 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 8.0.0-beta.23314.2 -> To Version 8.0.0-beta.23330.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20230707.1 Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-preview.7.23357.1 * Update dependencies from https://github.com/dotnet/arcade build 20230707.3 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.23328.2 -> To Version 8.0.0-beta.23357.3 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 8.0.0-beta.23314.2 -> To Version 8.0.0-beta.23355.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20230707.13 Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-preview.7.23357.13 * Update dependencies from https://github.com/dotnet/arcade build 20230710.1 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.23328.2 -> To Version 8.0.0-beta.23360.1 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 8.0.0-beta.23314.2 -> To Version 8.0.0-beta.23358.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/runtime build 20230709.3 Microsoft.NET.ILLink.Tasks , Microsoft.NET.Sdk.IL , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , System.Text.Json From Version 8.0.0-preview.7.23325.2 -> To Version 8.0.0-preview.7.23359.3 * Update dependencies from https://github.com/dotnet/sdk build 20230710.1 Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-preview.7.23360.1 * reenable json reflection * Move setting to test project template * Update dependencies from https://github.com/dotnet/arcade build 20230710.4 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.23328.2 -> To Version 8.0.0-beta.23360.4 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 8.0.0-beta.23314.2 -> To Version 8.0.0-beta.23359.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/icu build 20230710.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 8.0.0-preview.7.23326.2 -> To Version 8.0.0-preview.7.23360.1 * Update dependencies from https://github.com/dotnet/xharness build 20230710.3 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 8.0.0-prerelease.23326.1 -> To Version 8.0.0-prerelease.23360.3 * Update dependencies from https://github.com/dotnet/runtime-assets build 20230710.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 8.0.0-beta.23326.1 -> To Version 8.0.0-beta.23360.1 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20230710.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 8.0.0-alpha.0.23326.2 -> To Version 8.0.0-alpha.0.23360.1 * Update dependencies from https://github.com/dotnet/cecil build 20230710.2 Microsoft.DotNet.Cecil From Version 0.11.4-alpha.23327.1 -> To Version 0.11.4-alpha.23360.2 * Update dependencies from https://github.com/dotnet/sdk build 20230711.2 Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-preview.7.23361.2 * Moving JsonSerializerIsReflectionEnabledByDefault to only be set in the tests that need it. * Update Version.Details.xml * Update Versions.props * Enable the reflection serializer for EAT builds * Update dependencies from https://github.com/dotnet/arcade build 20230711.1 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.23328.2 -> To Version 8.0.0-beta.23361.1 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 8.0.0-beta.23314.2 -> To Version 8.0.0-beta.23360.2 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/emsdk build 20230711.2 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.7.23326.1 -> To Version 8.0.0-preview.7.23361.2 * move the JsonSerializerIsReflectionEnabledByDefault to tests.wasm.targets * [wasm] WBT: Fix breaking tests `Wasm.Build.Tests.WasmTemplateTests.RunWithDifferentAppBundleLocations` broke with the latest sdk: `/root/helix/work/workitem/e/dotnet-latest/sdk/8.0.100-preview.7.23362.1/Roslyn/Microsoft.CSharp.Core.targets(80,5): error MSB6004: The specified task executable location "/root/helix/work/workitem/e/dotnet-latest/dotnet/dotnet" is invalid.` This was because dotnet/roslyn#68918 changed to expect `DOTNET_ROOT` to be a directory instead of the exe path. * Update tests.wasm.targets * [wasm] set JsonSerializerIsReflectionEnabledByDefault unconditionally feedback from @eiriktsarpalis * Update eng/testing/tests.wasm.targets Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com> * Json Trimming tests use DisabledProperties * [wasm] WBT: Set DOTNET_ROOT for tests * [wasm] WBT: Set DOTNET_ROOT explicitly in the helix environment The `NonWasmTemplateBuildTests` avoid using the default environment variables used for all other tests, which includes `DOTNET_ROOT`. Set `DOTNET_ROOT` explicitly in the helix setup script for windows, so we always have a fallback. ``` Wasm.Build.Tests.NonWasmTemplateBuildTests.NonWasmConsoleBuild_WithoutWorkload(config: "Debug", extraBuildArgs: "", targetFramework: "net6.0") [FAIL] Expected 0 exit code but got 1: C:\helix\work\workitem\e\dotnet-none\dotnet.exe build -restore -c Debug -bl:C:\helix\work\workitem\uploads\xharness-output\logs\nonwasm_net6.0_Debug_iyhtgmvj.uu4.binlog -f net6.0 Standard Output: [] MSBuild version 17.8.0-preview-23361-03+5ab64ed27 for .NET [] Determining projects to restore... [] Restored C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj (in 820 ms). [] Determining projects to restore... [] Restored C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj (in 11.21 sec). [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.RuntimeIdentifierInference.targets(314,5): message NETSDK1057: You are using a preview version of .NET. See: https://aka.ms/dotnet-support-policy [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : You must install or update .NET to run this application. [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : App: C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\bincore\csc.dll [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : Architecture: x64 [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : Framework: 'Microsoft.NETCore.App', version '8.0.0-preview.7.23361.9' (x64) [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : .NET location: C:\helix\work\correlation\dotnet-cli\ [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : The following frameworks were found: [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : 8.0.0-preview.5.23280.8 at [C:\helix\work\correlation\dotnet-cli\shared\Microsoft.NETCore.App] [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : Learn more: [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : https://aka.ms/dotnet/app-launch-failed [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : To install missing framework, download: [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] C:\helix\work\workitem\e\dotnet-none\sdk\8.0.100-preview.7.23362.1\Roslyn\Microsoft.CSharp.Core.targets(80,5): error : https://aka.ms/dotnet-core-applaunch?framework=Microsoft.NETCore.App&framework_version=8.0.0-preview.7.23361.9&arch=x64&rid=win10-x64 [C:\helix\work\workitem\e\wbt\nonwasm_net6.0_Debug_iyhtgmvj.uu4\nonwasm_net6.0_Debug_iyhtgmvj.uu4.csproj] [] ``` --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Larry Ewing <lewing@microsoft.com> Co-authored-by: Sven Boemer <sbomer@gmail.com> Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> Co-authored-by: Ankit Jain <radical@gmail.com>

@jaredpar

* Enable building with a dotnet not on PATH In #68918 we removed inspecting DOTNET_HOST_PATH environment variable. This broke the scenario where a specific dotnet "hive" was installed to a location not on the PATH. When the .NET SDK commands invoke a sub-process (for example MSBuild), it sets the DOTNET_HOST_PATH environment variable to tell the sub-process "this is where the dotnet.exe that invoked this command is located". See #21237 and dotnet/cli#7311 for more info. This change reverts the behavior back to respect DOTNET_HOST_PATH, and if it isn't set it will just use "dotnet" and let the OS take care of finding the executable on the PATH. Fix #69150 * Fix tests to workaround MSBuild searching the PATH itself. * Respond to PR feedback. Make the change smaller until @jaredpar gets back. Only make the minimal change required, which is to check DOTNET_HOST_PATH.

jaredpar added 4 commits July 6, 2023 15:35

Refactor

0c27ab6

progress

d2ba032

more progress

8d956a0

more

6a39ed8

dotnet-issue-labeler bot added Area-Compilers untriaged Issues and PRs which have not yet been triaged by a lead labels Jul 7, 2023

jaredpar marked this pull request as ready for review July 7, 2023 18:57

jaredpar requested a review from a team as a code owner July 7, 2023 18:57

jaredpar commented Jul 7, 2023

View reviewed changes

333fred reviewed Jul 10, 2023

View reviewed changes

chsienki approved these changes Jul 10, 2023

View reviewed changes

Jared Parsons and others added 6 commits July 10, 2023 12:55

Fix

36a77fb

fix

893cd55

debug the test

6994947

fix test

ee84652

cleanup test

1f3773e

more

27abc64

jaredpar force-pushed the fix-args branch from fd05146 to 27abc64 Compare July 10, 2023 20:00

chsienki approved these changes Jul 10, 2023

View reviewed changes

src/Compilers/Core/MSBuildTaskTests/VbcTests.cs Outdated Show resolved Hide resolved

src/Compilers/Core/MSBuildTaskTests/VbcTests.cs Outdated Show resolved Hide resolved

333fred approved these changes Jul 10, 2023

View reviewed changes

Apply suggestions from code review

e00d7d8

Co-authored-by: Chris Sienkiewicz <chsienki@microsoft.com>

jaredpar enabled auto-merge (squash) July 11, 2023 16:11

jaredpar disabled auto-merge July 11, 2023 16:11

jaredpar enabled auto-merge (squash) July 11, 2023 16:11

jaredpar merged commit 854fa07 into dotnet:main Jul 11, 2023
25 checks passed

ghost added this to the Next milestone Jul 11, 2023

jaredpar deleted the fix-args branch July 11, 2023 20:05

jaredpar modified the milestones: Next, 17.8 Jul 12, 2023

This was referenced Jul 12, 2023

[wasm] WBT: Fix breaking tests dotnet/runtime#88751

Merged

Fix mono aot build dotnet/performance#3122

Merged

This was referenced Jul 17, 2023

[main] Update dependencies from dotnet/installer dotnet/android#8176

Merged

[main] Update dependencies from dotnet/runtime dotnet/efcore#31178

Merged

eerhardt mentioned this pull request Jul 24, 2023

Enable building with a dotnet not on PATH #69186

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove host specific args from CommandLineArgs #68918

Remove host specific args from CommandLineArgs #68918

jaredpar commented Jul 7, 2023

jaredpar commented Jul 7, 2023

jaredpar Jul 7, 2023

jaredpar Jul 7, 2023

333fred Jul 10, 2023

jaredpar Jul 10, 2023

chsienki left a comment

jaredpar commented Jul 10, 2023

333fred left a comment

		@@ -184,60 +184,22 @@ public bool SkipInteractiveExecution

		#region Tool Members

		// See ManagedCompiler.cs on the logic of this property

		@@ -477,15 +477,6 @@ public bool ReportIVTs

		#endregion

		// ToolExe delegates back to ToolName if the override is not

Remove host specific args from CommandLineArgs #68918

Remove host specific args from CommandLineArgs #68918

Conversation

jaredpar commented Jul 7, 2023

jaredpar commented Jul 7, 2023

jaredpar Jul 7, 2023

Choose a reason for hiding this comment

jaredpar Jul 7, 2023

Choose a reason for hiding this comment

333fred Jul 10, 2023

Choose a reason for hiding this comment

jaredpar Jul 10, 2023

Choose a reason for hiding this comment

chsienki left a comment

Choose a reason for hiding this comment

jaredpar commented Jul 10, 2023

333fred left a comment

Choose a reason for hiding this comment