Skip to content

Introduce PublishSelfContained #28714

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

Merged
nagilson merged 20 commits into from
Nov 4, 2022
Merged

Introduce PublishSelfContained #28714

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
35bdab7
Implement publish-self-contained and add tests.
nagilson Sep 16, 2022
5a3000e
Test now considers proper behavior with globals
nagilson Oct 21, 2022
0908423
Change the precedence of SC vs PSC
nagilson Oct 21, 2022
30fc065
Remove redundant tests
nagilson Oct 21, 2022
537f69e
Only do the RID inference if we're publishing.
nagilson Oct 21, 2022
bac1d6d
Add PSC RID test
nagilson Oct 21, 2022
385a936
Use unique test names in theory so helix doesnt be a baka:
nagilson Oct 21, 2022
8516ab6
Clean up code around targets
nagilson Oct 25, 2022
d923dae
Dont use PSC for RID checks.
nagilson Oct 25, 2022
7c50bac
Consider the case where SelfContained is global but not passed in CLI
nagilson Oct 25, 2022
c95ff57
All of the examples work now
nagilson Oct 25, 2022
a2f448b
Remove bl artifact
nagilson Oct 25, 2022
91fc5b0
Remove the ridiculous amount of overengineering
nagilson Oct 26, 2022
0f8d4a7
Add warning for invalid publishsc values
nagilson Oct 27, 2022
159c5d3
Add more precise language to the error
nagilson Oct 31, 2022
4ad49d6
Add the test things
nagilson Nov 1, 2022
244a090
Conclude work on the tests.
nagilson Nov 1, 2022
509598d
Remove BL again
nagilson Nov 1, 2022
a6e5ce0
Remove psc error added in 7.0.2xx merge, and remove changes to testpr…
nagilson Nov 2, 2022
7745b24
Merge remote-tracking branch 'upstream/release/7.0.2xx' into nagilson…
nagilson Nov 4, 2022
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
Prev Previous commit
Next Next commit
Dont use PSC for RID checks.
  • Loading branch information
@nagilson
nagilson committed Nov 2, 2022
commit d923dae704d5ea252bd465e149350cd22722055f
9 changes: 7 additions & 2 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ Copyright (c) .NET Foundation. All rights reserved.
<RuntimeIdentifier Condition="'$(PlatformTarget)' == 'x86' or '$(PlatformTarget)' == ''">win7-x86</RuntimeIdentifier>
</PropertyGroup>

<!-- PubishSelfContained may be set but not change self contained if we are not publishing, or self contained was already set globally. This condition tracks whether it will take effect.-->
<PropertyGroup Condition=" '$(_CommandLineDefinedSelfContained)' != 'true' and '$(_IsPublishing)' == 'true' and ('$(PublishSelfContained)' == 'true' or '$(PublishSelfContained)' == 'false')">
<_PublishSelfContainedIsActive>true</_PublishSelfContainedIsActive>
</PropertyGroup>

<PropertyGroup Condition="'$(UseCurrentRuntimeIdentifier)' == ''">
<UseCurrentRuntimeIdentifier Condition="
'$(RuntimeIdentifier)' == '' and
Expand All @@ -71,7 +76,7 @@ Copyright (c) .NET Foundation. All rights reserved.
'$(PublishReadyToRun)' == 'true' or
'$(PublishSingleFile)' == 'true' or
'$(PublishAot)' == 'true' or
('$(_CommandLineDefinedSelfContained)' != 'true' and '$(_IsPublishing)' == 'true' and '$(PublishSelfContained)' == 'true')
'$(_PublishSelfContainedIsActive)' == 'true'
)">true</UseCurrentRuntimeIdentifier>
</PropertyGroup>

Expand Down Expand Up @@ -170,7 +175,7 @@ Copyright (c) .NET Foundation. All rights reserved.
ResourceName="ImplicitRuntimeIdentifierResolutionForPublishPropertyFailed"
FormatArguments="SelfContained"/>

<NETSdkError Condition="'$(_IsPublishing)' == 'true' and '$(PublishSelfContained)' == 'true' and '$(RuntimeIdentifier)' == '' and '$(RuntimeIdentifiers)' == ''"
<NETSdkError Condition="'$(_PublishSelfContainedIsActive)' == 'true' and '$(RuntimeIdentifier)' == '' and '$(RuntimeIdentifiers)' == ''"
ResourceName="ImplicitRuntimeIdentifierResolutionForPublishPropertyFailed"
FormatArguments="PublishSelfContained"/>

Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Copyright (c) .NET Foundation. All rights reserved.

<!-- Edit SelfContained to match the value of PublishSelfContained if we are publishing.
This Won't affect t:/Publish (because of _IsPublishing), and also won't override a global SelfContained property.-->
<PropertyGroup Condition="'$(_CommandLineDefinedSelfContained)' != 'true' and '$(_IsPublishing)' == 'true'">
<PropertyGroup Condition="'$(_PublishSelfContainedIsActive)' == 'true'">
<SelfContained Condition="'$(PublishSelfContained)' == 'true' or '$(PublishSelfContained)' == 'false'">$(PublishSelfContained)</SelfContained>
</PropertyGroup>

Expand Down