Move RepoToolset into arcade

Arcade.sln

@@ -24,6 +24,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.SignTool",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.GitSync", "src\Microsoft.DotNet.GitSync\Microsoft.DotNet.GitSync.csproj", "{F7E1C1EF-C234-41BA-A24F-FAD5F357562C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Arcade.Sdk", "src\Microsoft.DotNet.Arcade.Sdk\Microsoft.DotNet.Arcade.Sdk.csproj", "{747A5C75-6069-4C45-8049-AEAA1D864105}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -130,6 +132,18 @@ Global
 		{F7E1C1EF-C234-41BA-A24F-FAD5F357562C}.Release|x64.Build.0 = Release|Any CPU
 		{F7E1C1EF-C234-41BA-A24F-FAD5F357562C}.Release|x86.ActiveCfg = Release|Any CPU
 		{F7E1C1EF-C234-41BA-A24F-FAD5F357562C}.Release|x86.Build.0 = Release|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Debug|x64.Build.0 = Debug|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Debug|x86.Build.0 = Debug|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Release|Any CPU.Build.0 = Release|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Release|x64.ActiveCfg = Release|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Release|x64.Build.0 = Release|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Release|x86.ActiveCfg = Release|Any CPU
+		{747A5C75-6069-4C45-8049-AEAA1D864105}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -142,6 +156,7 @@ Global
 		{A31D6804-9AF4-4618-8D73-16B76E3F8347} = {730AF68A-22FD-4372-9341-5F67D7701DA7}
 		{91FCE4C5-E83B-4C81-B0ED-3EAE417CBBE0} = {A564AF6E-6E4E-44EA-B2D7-C909C6687763}
 		{FE2D1224-2C69-48E2-AEE6-F524AEACF567} = {730AF68A-22FD-4372-9341-5F67D7701DA7}
+		{747A5C75-6069-4C45-8049-AEAA1D864105} = {730AF68A-22FD-4372-9341-5F67D7701DA7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {06E6CFF5-C54E-4623-9587-71A9E3F041D9}

Directory.Build.props

@@ -4,7 +4,7 @@
     <ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
   </PropertyGroup>
 
-  <Import Project="Sdk.props" Sdk="RoslynTools.RepoToolset" />
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
   <PropertyGroup>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
@@ -15,6 +15,6 @@
   <PropertyGroup>
     <!-- 'NetFxTfm' is the standard desktop Target Framework Moniker which this repo's packages are targeting
          ie.  Place 'NetFxTfm' in the 'TargetFramework' property of a csproj like <TargetFrameworks>netcoreapp2.0;$(NetFxTfm)</TargetFrameworks> -->
-    <NetFxTfm>net45</NetFxTfm>
+    <NetFxTfm>net461</NetFxTfm>
   </PropertyGroup>
 </Project>

Directory.Build.targets

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="Sdk.targets" Sdk="RoslynTools.RepoToolset" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
   <Target Name="_InitializeNuspecProperties"
           BeforeTargets="GenerateNuSpec"

NuGet.Config

@@ -3,12 +3,9 @@
   <solution>
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
-  <config>
-    <add key="repositoryPath" value="packages" />
-  </config>
   <packageSources>
     <clear />
-    <add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
+    <add key="arcade" value="https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

eng/Sdk.targets

@@ -0,0 +1,61 @@
+<Project>
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <PackageType>MSBuildSdk</PackageType>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
+  <!--
+    Default to including all *.props and *.targets files
+    from the project directory into the nuget package root
+  -->
+  <ItemGroup Condition="'$(EnableDefaultItems)' != 'false'">
+    <None Condition="'$(EnableDefaultNoneItems)' != 'false'"
+          Include="**/*.props;**/*.targets" Pack="true">
+      <PackagePath>%(RecursiveDir)%(Filename)%(Extension)</PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <!--
+      Update all PackageReference and ProjectReference Items to have
+      PrivateAssets="All" and default Publish to true
+      This removes the dependency nodes from the generated nuspec and
+      forces the publish output to contain the dlls.
+     -->
+    <PackageReference Update="@(PackageReference)">
+      <PrivateAssets>All</PrivateAssets>
+      <Publish Condition=" '%(PackageReference.Publish)' != 'false' ">true</Publish>
+    </PackageReference>
+    <ProjectReference Update="@(ProjectReference)">
+      <PrivateAssets>All</PrivateAssets>
+      <Publish Condition=" '%(ProjectReference.Publish)' != 'false' ">true</Publish>
+    </ProjectReference>
+    <!--
+      Update all Reference items to have Pack="false"
+      This removes the frameworkDependency nodes from the generated nuspec
+    -->
+    <Reference Update="@(Reference)">
+      <Pack>false</Pack>
+    </Reference>
+  </ItemGroup>
+
+  <!--
+    if $(IncludePublishOutput) it not 'false' add Publish as a dependency to Pack
+    and include TfmSpecificPackageFile items for all published files
+  -->
+  <PropertyGroup Condition="'$(IncludePublishOutput)' != 'false'">
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);CollectAssets</TargetsForTfmSpecificContentInPackage>
+  </PropertyGroup>
+  <Target Name="CollectAssets" DependsOnTargets="Publish">
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="@(ResolvedFileToPublish->'$([MSBuild]::NormalizeDirectory($(PublishDir)))%(RelativePath)')">
+        <PackagePath>tools/$(TargetFramework)/%(ResolvedFileToPublish.RelativePath)</PackagePath>
+      </TfmSpecificPackageFile>
+    </ItemGroup>
+  </Target>
+</Project>

eng/SignToolData.json

@@ -6,17 +6,19 @@
       "values": [
         "bin/Microsoft.DotNet.Build.Tasks.Feed/netstandard1.5/Microsoft.DotNet.Build.Tasks.Feed.dll",
         "bin/Microsoft.DotNet.Build.Tasks.Feed/netstandard1.5/*/Microsoft.DotNet.Build.Tasks.Feed.resources.dll",
-        "bin/Microsoft.DotNet.Build.Tasks.Feed/net45/Microsoft.DotNet.Build.Tasks.Feed.dll",
-        "bin/Microsoft.DotNet.Build.Tasks.Feed/net45/*/Microsoft.DotNet.Build.Tasks.Feed.resources.dll",
+        "bin/Microsoft.DotNet.Build.Tasks.Feed/net461/Microsoft.DotNet.Build.Tasks.Feed.dll",
+        "bin/Microsoft.DotNet.Build.Tasks.Feed/net461/*/Microsoft.DotNet.Build.Tasks.Feed.resources.dll",
         "bin/Microsoft.DotNet.Build.Tasks.Packaging/net46/Microsoft.DotNet.Build.Tasks.Packaging.dll",
         "bin/Microsoft.DotNet.Build.Tasks.Packaging/netcoreapp2.0/Microsoft.DotNet.Build.Tasks.Packaging.dll",
         "bin/Microsoft.DotNet.Helix.Client/netstandard1.4/Microsoft.DotNet.Helix.Client.dll",
-        "bin/Microsoft.DotNet.Helix.Client/net45/Microsoft.DotNet.Helix.Client.dll",
+        "bin/Microsoft.DotNet.Helix.Client/net461/Microsoft.DotNet.Helix.Client.dll",
         "bin/Microsoft.DotNet.Helix.Sdk/netstandard2.0/Microsoft.DotNet.Helix.Sdk.dll",
-        "bin/Microsoft.DotNet.Helix.Sdk/net45/Microsoft.DotNet.Helix.Sdk.dll",
+        "bin/Microsoft.DotNet.Helix.Sdk/net461/Microsoft.DotNet.Helix.Sdk.dll",
         "bin/Microsoft.DotNet.SignTool/net461/Microsoft.DotNet.SignTool.exe",
         "bin/Microsoft.DotNet.SignTool/netcoreapp2.0/Microsoft.DotNet.SignTool.dll",
-        "bin/Microsoft.DotNet.SignTool.Tests/netcoreapp2.0/Microsoft.DotNet.SignTool.Tests.dll"
+        "bin/Microsoft.DotNet.SignTool.Tests/netcoreapp2.0/Microsoft.DotNet.SignTool.Tests.dll",
+        "bin/Microsoft.DotNet.Arcade.Sdk/net461/Microsoft.DotNet.Arcade.Sdk.dll",
+        "bin/Microsoft.DotNet.Arcade.Sdk/netcoreapp2.0/Microsoft.DotNet.Arcade.Sdk.dll"
       ]
     },
     {
@@ -29,7 +31,9 @@
   ],
   "exclude": [
     "Microsoft.Azure.KeyVault.Core.dll",
+    "Microsoft.Build.dll",
     "Microsoft.Build.Framework.dll",
+    "Microsoft.Build.Tasks.Core.dll",
     "Microsoft.Build.Utilities.Core.dll",
     "Microsoft.CSharp.dll",
     "Microsoft.Data.Edm.dll",
@@ -39,6 +43,8 @@
     "Microsoft.DiaSymReader.PortablePdb.dll",
     "Microsoft.DotNet.VersionTools.dll",
     "Microsoft.Rest.ClientRuntime.dll",
+    "Microsoft.VisualStudio.Setup.Configuration.Interop.dll",
+    "Microsoft.Win32.Primitives.dll",
     "Microsoft.WindowsAzure.Storage.dll",
     "Newtonsoft.Json.dll",
     "NuGet.Commands.dll",
@@ -54,18 +60,26 @@
     "NuGet.Protocol.dll",
     "NuGet.Versioning.dll",
     "SleetLib.dll",
+    "System.AppContext.dll",
     "System.Buffers.dll",
     "System.Collections.Concurrent.dll",
     "System.Collections.Immutable.dll",
     "System.Collections.NonGeneric.dll",
+    "System.Console.dll",
     "System.Diagnostics.DiagnosticSource.dll",
+    "System.Diagnostics.Process.dll",
+    "System.Diagnostics.TraceSource.dll",
     "System.Dynamic.Runtime.dll",
+    "System.Globalization.Calendars.dll",
+    "System.IO.Compression.dll",
     "System.IO.Compression.ZipFile.dll",
+    "System.IO.FileSystem.dll",
     "System.IO.FileSystem.Primitives.dll",
     "System.IO.FileSystem.Watcher.dll",
     "System.Linq.dll",
     "System.Linq.Expressions.dll",
     "System.Net.Http.dll",
+    "System.Net.Sockets.dll",
     "System.ObjectModel.dll",
     "System.Reflection.Emit.dll",
     "System.Reflection.Emit.ILGeneration.dll",
@@ -87,11 +101,13 @@
     "System.Text.RegularExpressions.dll",
     "System.Threading.dll",
     "System.Threading.Overlapped.dll",
+    "System.Threading.Tasks.Dataflow.dll",
     "System.Threading.Tasks.Extensions.dll",
     "System.Threading.Thread.dll",
     "System.Threading.ThreadPool.dll",
     "System.Xml.ReaderWriter.dll",
     "System.Xml.XDocument.dll",
-    "System.Xml.XmlDocument.dll"
+    "System.Xml.XmlDocument.dll",
+    "vswhere.exe"
   ]
 }

eng/Versions.props

@@ -14,12 +14,13 @@
     <CredentialManagementVersion>1.0.2</CredentialManagementVersion>
     <LibGit2SharpVersion>0.25.2</LibGit2SharpVersion>
     <log4netVersion>2.0.8</log4netVersion>
-    <MicrosoftBuildTasksCoreVersion>14.3.0</MicrosoftBuildTasksCoreVersion>
-    <MicrosoftBuildVersion>14.3.0</MicrosoftBuildVersion>
+    <SystemNetHttpVersion>4.3.3</SystemNetHttpVersion>
+    <MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
+    <MicrosoftBuildFrameworkVersion>15.7.179</MicrosoftBuildFrameworkVersion>
+    <MicrosoftBuildTasksCoreVersion>15.7.179</MicrosoftBuildTasksCoreVersion>
+    <MicrosoftBuildUtilitiesCoreVersion>15.7.179</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftDotNetVersionToolsVersion>2.2.0-preview1-02815-01</MicrosoftDotNetVersionToolsVersion>
     <MicrosoftRestClientRuntimeVersion>3.0.3</MicrosoftRestClientRuntimeVersion>
-    <MicrosoftBuildFrameworkVersion>15.1.548</MicrosoftBuildFrameworkVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>15.1.548</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftExtensionsFileSystemGlobbingVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
     <MicrosoftNetTestSdkVersion>15.7.2</MicrosoftNetTestSdkVersion>
     <MoqVersion>4.8.3</MoqVersion>

eng/common/build.ps1

@@ -181,7 +181,7 @@ function GetBuildCommand() {
 }
 
 function InitializeToolset([string] $buildDriver, [string]$buildArgs) {
-  $toolsetVersion = $GlobalJson.'msbuild-sdks'.'RoslynTools.RepoToolset'
+  $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
   $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"
 
   if (Test-Path $toolsetLocationFile) {
@@ -199,7 +199,7 @@ function InitializeToolset([string] $buildDriver, [string]$buildArgs) {
 
   $proj = Join-Path $ToolsetDir "restore.proj"  
 
-  '<Project Sdk="RoslynTools.RepoToolset"/>' | Set-Content $proj
+  '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' | Set-Content $proj
   & $buildDriver $buildArgs $proj /t:__WriteToolsetLocation /m /nologo /clp:None /warnaserror /bl:$ToolsetRestoreLog /v:$verbosity /p:__ToolsetLocationOutputFile=$toolsetLocationFile
 
   if ($lastExitCode -ne 0) {

eng/common/build.sh

@@ -220,7 +220,7 @@ function GetDotNetInstallScript {
 }
 
 function InitializeToolset {
-  ReadJson $global_json_file "RoslynTools.RepoToolset"
+  ReadJson $global_json_file "Microsoft.DotNet.Arcade.Sdk"
   local toolset_version=$readjsonvalue
   local toolset_location_file="$toolset_dir/$toolset_version.txt"
 
@@ -239,7 +239,7 @@ function InitializeToolset {
 
   local proj="$toolset_dir/restore.proj"
 
-  echo '<Project Sdk="RoslynTools.RepoToolset"/>' > $proj
+  echo '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' > $proj
   "$build_driver" msbuild $proj /t:__WriteToolsetLocation /m /nologo /clp:None /warnaserror /bl:$toolset_restore_log /v:$verbosity /p:__ToolsetLocationOutputFile=$toolset_location_file 
   local lastexitcode=$?
 
@@ -341,4 +341,4 @@ function Main {
   ExitWithExitCode $?
 }
 
-Main
+Main

global.json

@@ -3,6 +3,6 @@
         "version": "2.1.300"
     },
     "msbuild-sdks": {
-        "RoslynTools.RepoToolset": "1.0.0-beta2-63011-05"
+        "Microsoft.DotNet.Arcade.Sdk": "1.0.0-bootstrap-1"
     }
 }

src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj

@@ -0,0 +1,34 @@
+<!-- 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>net461;netcoreapp2.0</TargetFrameworks>
+
+    <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
+
+    <IsPackable>true</IsPackable>
+
+    <Description>Common toolset for repositories</Description>
+    <PackageTags>Roslyn Build Repository Toolset MSBuild SDK</PackageTags>
+    <DevelopmentDependency>true</DevelopmentDependency>
+
+    <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
+    <EnableGeneratedPackageContent>false</EnableGeneratedPackageContent>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" Publish="false" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" Publish="false" />
+    <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="sdk/Sdk.props;sdk/Sdk.targets" Pack="true">
+      <PackagePath>sdk/%(Filename)%(Extension)</PackagePath>
+    </None>
+    <None Include="tools/*.*" Pack="true">
+      <PackagePath>tools/%(Filename)%(Extension)</PackagePath>
+    </None>
+  </ItemGroup>
+
+  <Import Project="$(RepoRoot)eng\Sdk.targets" />
+</Project>

src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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>
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildThisFileFullPath);$(MSBuildAllProjects)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- 
+      When the bootstrapper script initializes a repo it restores an empty project that imports the toolset SDK.
+      It invokes WriteToolsetLocation target with __ToolsetLocationOutputFile set to the path where the location of 
+      SDK Build.proj entry point is to be stored. Suppress all other imports for that project.      
+    -->
+    <_SuppressSdkImports>false</_SuppressSdkImports>
+    <_SuppressSdkImports Condition="'$(__ToolsetLocationOutputFile)' != ''">true</_SuppressSdkImports>
+  </PropertyGroup>
+
+  <Import Project="..\tools\Settings.props" Condition="!$(_SuppressSdkImports)" />
+
+</Project>

src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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>
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildThisFileFullPath);$(MSBuildAllProjects)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <!--
+    If a project specifies ExcludeFromSourceBuild=true during a source build suppress all targets and emulate a no-op
+    (empty common targets like Restore, Build, Pack, etc.).
+  -->
+  <PropertyGroup>
+    <_SuppressAllTargets>false</_SuppressAllTargets>
+    <_SuppressAllTargets Condition="'$(DotNetBuildFromSource)' == 'true' and '$(ExcludeFromSourceBuild)' == 'true'">true</_SuppressAllTargets>
+  </PropertyGroup>
+
+  <!-- 
+    Output the location of the Build.proj so that the build driver can find where it was restored.
+    Ideally we would have msbuild API to do that for an SDK: https://github.com/Microsoft/msbuild/issues/2992
+  -->
+  <Target Name="__WriteToolsetLocation" Outputs="$(__ToolsetLocationOutputFile)" Condition="'$(__ToolsetLocationOutputFile)' != ''">
+    <WriteLinesToFile File="$(__ToolsetLocationOutputFile)" Lines="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\Build.proj'))" Overwrite="true"/>
+    <ItemGroup>
+      <FileWrites Include="$(__ToolsetLocationOutputFile)" />
+    </ItemGroup>
+  </Target>
+
+  <Import Project="..\tools\Imports.targets" Condition="!$(_SuppressSdkImports) and !$(_SuppressAllTargets)" />
+  <Import Project="..\tools\Empty.targets" Condition="!$(_SuppressSdkImports) and $(_SuppressAllTargets)"/>
+</Project>