-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mono workloads: Fix building non-mono project when `RunAOTCompilation…
…=true` (#77762) This manifested in a case where a non-mono project was passed a mono specific property `RunAOTCompilation=true`, but instead of it getting ignored, the build failed with: ``` /usr/local/share/dotnet/sdk/7.0.200-preview.22521.7/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.targets(38,5): error NETSDK1147: To build this project, the following workloads must be installed: macos [/private/tmp/c/c.csproj] error NETSDK1147: To install these workloads, run the following command: dotnet workload restore [/private/tmp/c/c.csproj] ``` And this is because the `MonoAOTCompiler.Task` is imported with: https://github.com/dotnet/runtime/blob/82aa87f9cdf9ac20f0f685016648c36247a76ff1/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets.in#L57-L57 - This happens for net6, and net8 projects. Fixes #77707 . cc @steveisok @lewing
- Loading branch information
Showing
4 changed files
with
137 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.targets.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using Xunit; | ||
| using Xunit.Abstractions; | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace Wasm.Build.Tests; | ||
|
|
||
| public class NonWasmTemplateBuildTests : BuildTestBase | ||
| { | ||
| public NonWasmTemplateBuildTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext) | ||
| : base(output, buildContext) | ||
| { | ||
| } | ||
|
|
||
| // For building non-wasm project with the sdk installed, we need to | ||
| // patch the framework references. But we want to maintain the versions. | ||
| // So, copy the reference for latest TFM, and add that back with the | ||
| // TFM=DefaultTargetFramework | ||
| // | ||
| // This is useful for the case when we are on tfm=net7.0, but sdk, and packages | ||
| // are really 8.0 . | ||
| private const string s_latestTargetFramework = "net8.0"; | ||
| private const string s_previousTargetFramework = "net7.0"; | ||
| private static string s_directoryBuildTargetsForPreviousTFM = | ||
| $$""" | ||
| <Project> | ||
| <Target Name="_FixupVersions" BeforeTargets="ProcessFrameworkReferences"> | ||
| <ItemGroup> | ||
| <!-- Get net8.0 entry --> | ||
| <_KnownFrameworkReferenceToCopyFrom | ||
| Include="@(KnownFrameworkReference)" | ||
| Condition="'%(Identity)' == 'Microsoft.NETCore.App' and '%(TargetFramework)' == '{{s_latestTargetFramework}}'" /> | ||
| <!-- patch it's TFM=net7.0 --> | ||
| <_KnownFrameworkReferenceToCopyFrom Update="@(_KnownFrameworkReferenceToCopyFrom)" TargetFramework="{{DefaultTargetFramework}}" /> | ||
| <!-- remove the existing net7.0 entry --> | ||
| <KnownFrameworkReference | ||
| Remove="@(KnownFrameworkReference)" | ||
| Condition="'%(Identity)' == 'Microsoft.NETCore.App' and '%(TargetFramework)' == '{{DefaultTargetFramework}}'" /> | ||
| <!-- add the new patched up net7.0 entry --> | ||
| <KnownFrameworkReference Include="@(_KnownFrameworkReferenceToCopyFrom)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
| </Project> | ||
| """; | ||
|
|
||
| private static string s_directoryBuildTargetsForCurrentTFM = "<Project />"; | ||
|
|
||
| public static IEnumerable<object?[]> GetTestData() => | ||
| new IEnumerable<object?>[] | ||
| { | ||
| new object?[] { "Debug" }, | ||
| new object?[] { "Release" } | ||
| } | ||
| .AsEnumerable() | ||
| .MultiplyWithSingleArgs | ||
| ( | ||
| "", | ||
| "/p:RunAOTCompilation=true", | ||
| "/p:WasmBuildNative=true" | ||
| ) | ||
| .MultiplyWithSingleArgs | ||
| ( | ||
| "net6.0", | ||
| s_previousTargetFramework, | ||
| s_latestTargetFramework | ||
| ) | ||
| .UnwrapItemsAsArrays().ToList(); | ||
|
|
||
| [Theory, TestCategory("no-workload")] | ||
| [MemberData(nameof(GetTestData))] | ||
| public void NonWasmConsoleBuild_WithoutWorkload(string config, string extraBuildArgs, string targetFramework) | ||
| => NonWasmConsoleBuild(config, | ||
| extraBuildArgs, | ||
| targetFramework, | ||
| // net6 is sdk would be needed to run the app | ||
| shouldRun: targetFramework != "net6.0"); | ||
|
|
||
|
|
||
| [Theory] | ||
| [MemberData(nameof(GetTestData))] | ||
| public void NonWasmConsoleBuild_WithWorkload(string config, string extraBuildArgs, string targetFramework) | ||
| => NonWasmConsoleBuild(config, | ||
| extraBuildArgs, | ||
| targetFramework, | ||
| // net6 is sdk would be needed to run the app | ||
| shouldRun: targetFramework != "net6.0"); | ||
|
|
||
| private void NonWasmConsoleBuild(string config, | ||
| string extraBuildArgs, | ||
| string targetFramework, | ||
| string? directoryBuildTargets = null, | ||
| bool shouldRun = true) | ||
| { | ||
| string id = $"nonwasm_{targetFramework}_{config}_{Path.GetRandomFileName()}"; | ||
| InitPaths(id); | ||
| InitProjectDir(_projectDir); | ||
|
|
||
| directoryBuildTargets ??= targetFramework == s_previousTargetFramework | ||
| ? s_directoryBuildTargetsForPreviousTFM | ||
| : s_directoryBuildTargetsForCurrentTFM; | ||
|
|
||
| File.WriteAllText(Path.Combine(_projectDir, "Directory.Build.props"), "<Project />"); | ||
| File.WriteAllText(Path.Combine(_projectDir, "Directory.Build.targets"), directoryBuildTargets); | ||
|
|
||
| new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false) | ||
| .WithWorkingDirectory(_projectDir!) | ||
| .ExecuteWithCapturedOutput("new console --no-restore") | ||
| .EnsureSuccessful(); | ||
|
|
||
| new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false) | ||
| .WithWorkingDirectory(_projectDir!) | ||
| .ExecuteWithCapturedOutput($"build -restore -c {config} -bl:{Path.Combine(s_buildEnv.LogRootPath, $"{id}.binlog")} {extraBuildArgs} -f {targetFramework}") | ||
| .EnsureSuccessful(); | ||
|
|
||
| if (shouldRun) | ||
| { | ||
| var result = new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false) | ||
| .WithWorkingDirectory(_projectDir!) | ||
| .ExecuteWithCapturedOutput($"run -c {config} -f {targetFramework} --no-build") | ||
| .EnsureSuccessful(); | ||
|
|
||
| Assert.Contains("Hello, World!", result.Output); | ||
| } | ||
| } | ||
| } |