Remove Targets* instances from .props files #35353
Merged
Conversation
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
|
Tagging subscribers to this area: @ViktorHofer |
ViktorHofer
reviewed
Apr 23, 2020
src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
Outdated
Show resolved
Hide resolved
ericstj
reviewed
Apr 24, 2020
| <TargetFrameworks>netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> | ||
| <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <GeneratePlatformNotSupportedAssemblyMessage Condition="$(TargetFramework.StartsWith('netstandard')) and '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage> |
There was a problem hiding this comment.
You can’t use TargetsWindows here.
There was a problem hiding this comment.
Currently we cant entirely remove TargetsWindows and just depend on TargetFramework due to nuget restrictions.
There was a problem hiding this comment.
Can't you do $(TargetFramework.EndsWith('Windows_NT'))?
There was a problem hiding this comment.
no we remove Windows_NT in sdk.props. we need to do this to include nuget generated props and targets file
| <PropertyGroup> | ||
| <IsPartialFacadeAssembly Condition="$(TargetFramework.StartsWith('net4'))">true</IsPartialFacadeAssembly> | ||
| <OmitResources Condition="$(TargetFramework.StartsWith('net4'))">true</OmitResources> | ||
| <GeneratePlatformNotSupportedAssemblyMessage Condition="$(TargetFramework.StartsWith('netstandard')) and '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_ServiceController</GeneratePlatformNotSupportedAssemblyMessage> |
| <NoWarn Condition="'$(TargetsUnix)' == 'true'">$(NoWarn);CA1823</NoWarn> <!-- Avoid unused fields warnings in Unix build --> | ||
| <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetFrameworkCurrent)-Windows_NT;netstandard2.0-Windows_NT;netstandard2.0-Unix;netstandard2.0;net461-Windows_NT</TargetFrameworks> | ||
| <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> | ||
| <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> | ||
| <Nullable>enable</Nullable> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <IsPartialFacadeAssembly Condition="$(TargetFramework.StartsWith('net4'))">true</IsPartialFacadeAssembly> | ||
| <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsAnyOS)' == 'true' and $(TargetFramework.StartsWith('netstandard'))">SR.PlatformNotSupported_Registry</GeneratePlatformNotSupportedAssemblyMessage> |
|
@ericstj @ViktorHofer can i go ahead and merge this one ? |
ViktorHofer
reviewed
Apr 27, 2020
...ies/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
Show resolved
Hide resolved
Anipik
requested review from
ahsonkhan,
jozkee,
layomia and
steveharter
as code owners
Anipik
changed the title
|
i verified that intellisense is still working |
|
@ericstj @ViktorHofer @safern any comments ? |
safern
reviewed
Apr 28, 2020
safern
reviewed
Apr 28, 2020
ViktorHofer
reviewed
Apr 28, 2020
| <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> | ||
| <PropertyGroup> | ||
| <GeneratePlatformNotSupportedAssemblyMessage Condition="$(TargetFramework.StartsWith('netstandard'))">SR.PlatformNotSupported_ComponentModel_Composition</GeneratePlatformNotSupportedAssemblyMessage> | ||
| <NoWarn Condition="!$(TargetFramework.StartsWith('netcoreapp')) or '$(TargetFramework)' == 'netcoreapp2.0'">$(NoWarn);nullable</NoWarn> |
There was a problem hiding this comment.
It would be nice if you could do these checks in a way that doesn't break the tfm change which is scheduled for Monday: #35176.
safern
reviewed
Apr 28, 2020
src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
Show resolved
Hide resolved
ViktorHofer
reviewed
Apr 28, 2020
ViktorHofer
reviewed
Apr 28, 2020
| <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> | ||
| <TargetsNetStandardLowerThan21 Condition="'$(TargetsNetStandard)' == 'true' and '$(NETStandardVersion)' < 2.1">true</TargetsNetStandardLowerThan21> | ||
| <TargetsNetStandardLowerThan21 Condition="$(TargetFramework.StartsWith('netstandard')) and '$(NETStandardVersion)' < 2.1">true</TargetsNetStandardLowerThan21> |
There was a problem hiding this comment.
Do we need to move these into a second property group as well? same for the netstandard.depproj below.
There was a problem hiding this comment.
we dont run the design time build for deprojs
ViktorHofer
approved these changes
Apr 28, 2020
|
i will address the remaining comments in the follow up pr. |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #35317
We need to remove all occurences of TargetsNetfx, TargetsNetcoreApp and TargetsNetstandard from the props and csproj file
This issue removes them from isPartialFacadeAssemblyProperty