Skip to content

Don't add AOT package in restore for < net7 #31201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Don't add AOT package in restore for < net7 #31201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef7f871
Don't get AOT package in restore for < net7
jtschuster Mar 14, 2023
4d16ce5
Error during publish when there are no valid ilcompiler packs
jtschuster Mar 14, 2023
1eb4940
Merge branch 'main' of https://github.com/dotnet/sdk into PublishAotR…
jtschuster Jun 9, 2023
1ce7679
Fix warning
jtschuster Jun 9, 2023
2e2e0fd
add comment
jtschuster Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ var runtimeRequiredByDeployment
}
}

if (AotEnabled)
if (AotEnabled && _normalizedTargetFrameworkVersion.Major >= 7)
{
switch (AddToolPack(ToolPackType.ILCompiler, _normalizedTargetFrameworkVersion, packagesToDownload, implicitPackageReferences))
{
Expand Down
4 changes: 4 additions & 0 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ Copyright (c) .NET Foundation. All rights reserved.
ResourceName="PublishProfileNotPresent"
FormatArguments="$(PublishProfile)"/>

<!-- If the TFM is valid, ProcessFrameworkReferences task will warn in restore. If we reach here without a ILCompiler pack, its an invalid TFM -->
<NETSdkError Condition="'$(PublishAOT)' == 'true' and '@(TargetILCompilerPack)' == '' and '@(HostILCompilerPack)' == ''"
ResourceName="AotUnsupportedTargetFramework" />

<!-- Projects in a solution cannot have conflicting configurations. This checks if PublishRelease conflicted at runtime to avoid extra project evaluations.
SolutionExt is used to check if we are publishing a solution. Will be undefined if not.-->
<NETSdkError Condition="'$(_IsPublishing)' == 'true' and
Expand Down