Fixing up changes from master.

Directory.Build.props

@@ -6,7 +6,7 @@
     We are currently on too old of an SDK to detect - it doesn't have https://github.com/dotnet/sdk/pull/1242.
     But once we move to a new version, we can remove this property setting, and everything else will work correctly.
     -->
-    <UsingMicrosoftNETSdk>true</UsingMicrosoftNETSdk>
+    <UsingMicrosoftNETSdk Condition="'$(MSBuildProjectExtension)' == '.csproj'">true</UsingMicrosoftNETSdk>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(UsingMicrosoftNETSdk)' == 'true'">

RepoDirectories.props

@@ -18,10 +18,8 @@
 
     <ToolsDir Condition="'$(UseToolRuntimeForToolsDir)'=='true'">$(ToolRuntimePath)</ToolsDir>
     <ToolsDir Condition="'$(ToolsDir)'==''">$(RepoRoot)Tools/</ToolsDir>
-    <BuildToolsTaskCoreDir>$(ToolsDir)</BuildToolsTaskCoreDir>
+    <BuildToolsTaskDir>$(ToolRuntimePath)</BuildToolsTaskDir>
-    <BuildToolsTaskDesktopDir>$(ToolsDir)net46/</BuildToolsTaskDesktopDir>
+    <BuildToolsTaskDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(ToolsDir)net46/</BuildToolsTaskDir>
-    <BuildToolsTaskDir>$(BuildToolsTaskCoreDir)</BuildToolsTaskDir>
-    <BuildToolsTaskDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(BuildToolsTaskDesktopDir)</BuildToolsTaskDir>
     <LocalBuildToolsTaskDir>$(LocalToolRuntimePath)</LocalBuildToolsTaskDir>
     <LocalBuildToolsTaskDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(LocalToolRuntimePath)net46/</LocalBuildToolsTaskDir>
     <PackagingTaskDir Condition="'$(BuildToolsTaskDir)' != ''">$(BuildToolsTaskDir)</PackagingTaskDir>

src/managed/CommonManaged.props

@@ -15,15 +15,6 @@
     <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(StabilizePackageVersion)' != 'true'">
-    <!-- 
-    Ensure VersionSuffix is set (especially during 'dotnet restore')
-    to work around https://github.com/NuGet/Home/issues/4337
-     -->
-    <VersionSuffix Condition="'$(PreReleaseLabel)' != ''">$(PreReleaseLabel)-</VersionSuffix>
-    <VersionSuffix>$(VersionSuffix)$(BuildNumberMajor)-$(BuildNumberMinor)</VersionSuffix>
-  </PropertyGroup>
-
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>$(RepoRoot)tools-local/setuptools/Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

src/pkg/packaging/dir.proj

@@ -185,7 +185,8 @@
       <PackArgs>$(PackArgs) $(MSBuildPassThroughPropertyList) /p:BaseOutputPath=$(IntermediateOutputForPackaging)</PackArgs>
     </PropertyGroup>
 
-    <Exec Command="$(DotnetToolCommand) pack %(PackageProjects.Identity) $(PackArgs)" />
+    <Exec Command="$(DotnetToolCommand) pack %(PackageProjects.Identity) $(PackArgs)"
+          Condition="'@(PackageProjects)' != ''" />
   </Target>
 
 </Project>