Respond to PR feedback.

Moving DebugType, AssemblySearchPaths, and DesignTimeAssemblySearchPaths to be defaulted for all projects. Moving NoStdLib default to DisableStandardFrameworkResolution.
dotnet · Oct 7, 2016 · bba2f80 · bba2f80
1 parent db936ed
commit bba2f80
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/...Build.Tasks/build/netstandard1.0/Microsoft.NET.DisableStandardFrameworkResolution.targets b/...Build.Tasks/build/netstandard1.0/Microsoft.NET.DisableStandardFrameworkResolution.targets
@@ -18,6 +18,9 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_TargetFrameworkDirectories />
     <FrameworkPathOverride />
     <TargetFrameworkDirectory />
+
+    <!-- all references (even the StdLib) come from packages -->
+    <NoStdLib Condition="'$(NoStdLib)' == ''">true</NoStdLib>
   </PropertyGroup>
 
 </Project>
diff --git a/...sks/Microsoft.NET.Build.Tasks/build/netstandard1.0/Microsoft.NET.Sdk.BeforeCommon.targets b/...sks/Microsoft.NET.Build.Tasks/build/netstandard1.0/Microsoft.NET.Sdk.BeforeCommon.targets
@@ -41,24 +41,16 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <!-- Default settings for .NET Core and .NET Standard build logic -->
   <PropertyGroup Condition="'$(_IsNETCoreOrNETStandard)' == 'true'">
-    <DebugType Condition="'$(DebugType)' == ''">portable</DebugType>
     <AutoUnifyAssemblyReferences Condition="'$(AutoUnifyAssemblyReferences)' == ''">true</AutoUnifyAssemblyReferences>
     <DesignTimeAutoUnify Condition="'$(DesignTimeAutoUnify)' == ''">true</DesignTimeAutoUnify>
 
     <GenerateDependencyFile Condition=" '$(GenerateDependencyFile)' == '' ">true</GenerateDependencyFile>
 
-    <!-- all references (even the StdLib) come from packages -->
-    <NoStdLib Condition="'$(NoStdLib)' == ''">true</NoStdLib>
-
     <!-- Force .dll extension for .NETCoreApp and .NETStandard projects even if output type is exe. -->
     <TargetExt Condition="'$(TargetExt)' == ''">.dll</TargetExt>
 
     <!-- dependencies coming from the package manager lock file should not be copied locally for .NET Core and .NETStandard projects -->
     <CopyLocalLockFileAssemblies Condition="'$(CopyLocalLockFileAssemblies)' == ''">false</CopyLocalLockFileAssemblies>
-
-    <!-- Exclude GAC, registry, output directory from search paths. -->
-    <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">{CandidateAssemblyFiles};{HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</AssemblySearchPaths>
-    <DesignTimeAssemblySearchPaths Condition="'$(DesignTimeAssemblySearchPaths)' == ''">$(AssemblySearchPaths)</DesignTimeAssemblySearchPaths>
   </PropertyGroup>
 
   <!-- Set PublishDir here, before Microsoft.Common.targets, to avoid a competing default there. -->

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/netstandard1.0/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/build/netstandard1.0/Microsoft.NET.Sdk.props
@@ -41,8 +41,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <!-- Default settings for all projects built with this Sdk package -->
   <PropertyGroup>
+    <DebugType>portable</DebugType>
+
     <!-- This will turn off the base UWP-specific 'ResolveNuGetPackages' target -->
     <ResolveNuGetPackages>false</ResolveNuGetPackages>
+
+    <!-- Exclude GAC, registry, output directory from search paths. -->
+    <AssemblySearchPaths>{CandidateAssemblyFiles};{HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</AssemblySearchPaths>
+    <DesignTimeAssemblySearchPaths>$(AssemblySearchPaths)</DesignTimeAssemblySearchPaths>
   </PropertyGroup>
 
   <!-- Temporary hacks to work around bugs -->

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/netstandard1.0/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/netstandard1.0/Microsoft.NET.Sdk.targets
@@ -30,9 +30,8 @@ Copyright (c) .NET Foundation. All rights reserved.
   <UsingTask TaskName="GetAssemblyVersion" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
   <UsingTask TaskName="GenerateSatelliteAssemblies" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
 
-  <PropertyGroup Condition="'$(DisableStandardFrameworkResolution)' == ''">
-    <DisableStandardFrameworkResolution Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">true</DisableStandardFrameworkResolution>
-    <DisableStandardFrameworkResolution Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">true</DisableStandardFrameworkResolution>
+  <PropertyGroup>
+    <DisableStandardFrameworkResolution Condition="'$(DisableStandardFrameworkResolution)' == ''">$(_IsNETCoreOrNETStandard)</DisableStandardFrameworkResolution>
   </PropertyGroup>
 
   <PropertyGroup>