From 0a35980a31fa6ac6badaf6fe38035cb1c863d63b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Fri, 22 Jun 2018 11:50:16 -0700
Subject: [PATCH] Only import package versions in projects that restore toolset
 packages (#28065)

* Only import package versions in projects that restore toolset packages

* Add nuget.org feed
---
 NuGet.Config                                  | 3 +++
 build/Targets/Packages.props                  | 1 +
 build/ToolsetPackages/Directory.Build.props   | 4 ++++
 build/ToolsetPackages/Directory.Build.targets | 3 +++
 build/ToolsetPackages/InternalToolset.csproj  | 1 -
 build/ToolsetPackages/RoslynToolset.csproj    | 4 +---
 6 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 build/ToolsetPackages/Directory.Build.props
 create mode 100644 build/ToolsetPackages/Directory.Build.targets

diff --git a/NuGet.Config b/NuGet.Config
index 4ac3cb754a694..b161272fcae90 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -8,4 +8,7 @@
          ⚠ THIS IS A PERFORMANCE-CRITICAL LINE. DO NOT REMOVE. ⚠ -->
     <add key="enabled" value="false" />
   </packageRestore>
+  <packageSources>
+    <clear />
+  </packageSources>
 </configuration>
diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props
index 583ee34517240..7d4b3ab88706f 100644
--- a/build/Targets/Packages.props
+++ b/build/Targets/Packages.props
@@ -256,6 +256,7 @@
   <PropertyGroup>
     <RestoreSources>
       $(RestoreSources);
+      https://api.nuget.org/v3/index.json;
       https://dotnet.myget.org/F/dotnet-coreclr/api/v3/index.json;
       https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
       https://dotnet.myget.org/F/dotnet-corefxtestdata/api/v3/index.json;
diff --git a/build/ToolsetPackages/Directory.Build.props b/build/ToolsetPackages/Directory.Build.props
new file mode 100644
index 0000000000000..9085b37d2e6b9
--- /dev/null
+++ b/build/ToolsetPackages/Directory.Build.props
@@ -0,0 +1,4 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project>
+  <Import Project="..\Targets\Packages.props" />
+</Project>
\ No newline at end of file
diff --git a/build/ToolsetPackages/Directory.Build.targets b/build/ToolsetPackages/Directory.Build.targets
new file mode 100644
index 0000000000000..d7efd3fada3f3
--- /dev/null
+++ b/build/ToolsetPackages/Directory.Build.targets
@@ -0,0 +1,3 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project>
+</Project>
diff --git a/build/ToolsetPackages/InternalToolset.csproj b/build/ToolsetPackages/InternalToolset.csproj
index 971f253b4d490..baa1f68cdd1e6 100644
--- a/build/ToolsetPackages/InternalToolset.csproj
+++ b/build/ToolsetPackages/InternalToolset.csproj
@@ -3,7 +3,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net46</TargetFramework>
-    <NonShipping>true</NonShipping>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMerge)" />
diff --git a/build/ToolsetPackages/RoslynToolset.csproj b/build/ToolsetPackages/RoslynToolset.csproj
index 3ca05099a00b6..149cf5bf7e4e8 100644
--- a/build/ToolsetPackages/RoslynToolset.csproj
+++ b/build/ToolsetPackages/RoslynToolset.csproj
@@ -2,9 +2,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(RoslynPortableTargetFrameworks)</TargetFrameworks>
-    <NonShipping>true</NonShipping>
-    <OutputType>Library</OutputType>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Net.Sdk" Version="$(MicrosoftNetSdkVersion)" ExcludeAssets="all" />