From ca3e91eeadf943cef88b54929651d08cdc6158a4 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Thu, 7 May 2020 04:54:11 +0530 Subject: [PATCH 1/2] Optionally Disable .NET Framework's WinFX targets Disable NETFX WinFX everywhere unless we want to opt-out. Also, added a comment to clarify it's purpose. --- .../targets/Microsoft.NET.Sdk.BeforeCommon.targets | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets index 3e7346f0abb9..c9e966add682 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets @@ -18,9 +18,14 @@ Copyright (c) .NET Foundation. All rights reserved. - + - false + false @@ -60,6 +65,7 @@ Copyright (c) .NET Foundation. All rights reserved. --> + <_IsNETCoreOrNETStandard Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">true <_IsNETCoreOrNETStandard Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">true From 25def852c20c515a5ea61a817c515e7f4ecb4476 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Thu, 11 Jun 2020 03:34:29 +0530 Subject: [PATCH 2/2] Trim trailing whitespace Respect EditorConfig preferences --- .../Microsoft.NET.Sdk.BeforeCommon.targets | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets index c9e966add682..8b42b2d6e847 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets @@ -6,7 +6,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and created a backup copy. Incorrect changes to this file will make it impossible to load or build your projects from the command-line or the IDE. -Copyright (c) .NET Foundation. All rights reserved. +Copyright (c) .NET Foundation. All rights reserved. *********************************************************************************************** --> @@ -27,7 +27,7 @@ Copyright (c) .NET Foundation. All rights reserved. false - + <_IsExecutable Condition="'$(OutputType)' == 'Exe' or '$(OutputType)'=='WinExe'">true @@ -41,14 +41,14 @@ Copyright (c) .NET Foundation. All rights reserved. - + - @@ -96,7 +96,7 @@ Copyright (c) .NET Foundation. All rights reserved. is not needed for NETStandard or NETCore since references come from NuGet packages--> false - + $(PreserveCompilationContext) @@ -118,7 +118,7 @@ Copyright (c) .NET Foundation. All rights reserved. on the TargetFramework. --> - + <_SDKImplicitReference Include="System"/> @@ -128,7 +128,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + <_SDKImplicitReference Include="System.Core" Condition=" '$(_TargetFrameworkVersionWithoutV)' >= '3.5' "/> <_SDKImplicitReference Include="System.Runtime.Serialization" Condition=" '$(_TargetFrameworkVersionWithoutV)' >= '3.5' "/> @@ -139,7 +139,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_SDKImplicitReference Include="System.IO.Compression.FileSystem" Condition=" '$(_TargetFrameworkVersionWithoutV)' >= '4.5' "/> - + @@ -193,7 +193,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_ImplicitDefineConstant Include="$(_PlatformIdentifierForImplicitDefine)$(_PlatformVersionForImplicitDefine)" /> - +