Skip to content

Add RidSpecific, Make Apps RID Specific By Default & RID Now FDD By Default in 8.0+ #28412

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
nagilson wants to merge 12 commits into from
Closed

Add RidSpecific, Make Apps RID Specific By Default & RID Now FDD By Default in 8.0+ #28412

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f7e24e9
Add RuntimeSpecific
nagilson Oct 6, 2022
27791d2
Consider that there may not be a target framework
nagilson Oct 7, 2022
08e7eb5
Whoops I didn't see the breaking change spec but this should now make…
nagilson Oct 7, 2022
d182b45
Update xlf
nagilson Oct 7, 2022
04e421b
Add tests, but some are NET 8.0 so they break
nagilson Oct 7, 2022
3d0dc56
Make fact a theory so I can revert then re-revert the 8.0 tests into …
nagilson Oct 7, 2022
bf3d53d
oops wrong framework hahahahaaaaaa
nagilson Oct 7, 2022
7be2640
Meet your demise, 8.0 tests
nagilson Oct 7, 2022
b9e070d
Revert "Meet your demise, 8.0 tests"
nagilson Oct 7, 2022
6b1bb2f
Merge remote-tracking branch 'primary/main' into nagilson-ridspecific…
nagilson Oct 10, 2022
10e2d58
Merge remote-tracking branch 'upstream/main' into nagilson-ridspecifi…
nagilson Nov 22, 2022
0c58ed7
Update the tests to reflect the new test framework changes
nagilson Nov 22, 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
Next Next commit
Add RuntimeSpecific
  • Loading branch information
@nagilson
nagilson committed Oct 6, 2022
commit f7e24e9ebd281fe3365f01bf968de84e267ec3c4
11 changes: 10 additions & 1 deletion 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,15 @@ Copyright (c) .NET Foundation. All rights reserved.
<RuntimeIdentifier Condition="'$(PlatformTarget)' == 'x86' or '$(PlatformTarget)' == ''">win7-x86</RuntimeIdentifier>
</PropertyGroup>

<PropertyGroup Condition="'$(_TargetFrameworkVersionWithoutV)' >= '8.0' and '$(RuntimeSpecific)' == ''">
<RuntimeSpecific>true</RuntimeSpecific>
</PropertyGroup>

<PropertyGroup Condition="'$(RuntimeSpecific)' == 'true' and '$(RuntimeIdentifier)' == '' and '$(RuntimeIdentifiers)' == ''">
<RuntimeIdentifier>$(NETCoreSdkPortableRuntimeIdentifier)</RuntimeIdentifier>
<_RuntimeIdentifierInferredFromRuntimeSpecific>true</_RuntimeIdentifierInferredFromRuntimeSpecific>
</PropertyGroup>

<PropertyGroup Condition="'$(UseCurrentRuntimeIdentifier)' == 'true' or
(
'$(RuntimeIdentifier)' == '' and
Expand Down Expand Up @@ -124,7 +133,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<_SelfContainedWasSpecified Condition="'$(SelfContained)' != ''">true</_SelfContainedWasSpecified>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(HasRuntimeOutput)' == 'true'">
<SelfContained Condition="'$(SelfContained)' == '' and '$(RuntimeIdentifier)' != ''">true</SelfContained>
<SelfContained Condition="'$(SelfContained)' == '' and '$(RuntimeIdentifier)' != '' and '$(_RuntimeIdentifierInferredFromRuntimeSpecific) != 'true'">true</SelfContained>
<SelfContained Condition="'$(SelfContained)' == ''">false</SelfContained>
<_RuntimeIdentifierUsesAppHost Condition="$(RuntimeIdentifier.StartsWith('ios')) or $(RuntimeIdentifier.StartsWith('tvos')) or $(RuntimeIdentifier.StartsWith('maccatalyst')) or $(RuntimeIdentifier.StartsWith('android')) or $(RuntimeIdentifier.StartsWith('browser'))">false</_RuntimeIdentifierUsesAppHost>
<_RuntimeIdentifierUsesAppHost Condition="'$(_RuntimeIdentifierUsesAppHost)' == ''">true</_RuntimeIdentifierUsesAppHost>
Expand Down