Merge remote-tracking branch 'origin/master' into merge/release/2.2-to-master

Author: jkotalik

.gitignore

@@ -1,6 +1,7 @@
 bin/
 obj/
 .vs/
+.vscode/
 *.suo
 *.user
 _ReSharper.*

Directory.Build.props

@@ -106,7 +106,7 @@
     <IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>
   </PropertyGroup>
 
-  <Import Project="build\tasks\RepoTasks.tasks" Condition="'$(MSBuildProjectName)' != 'RepoTasks'" />
+  <Import Project="build\tasks\RepoTasks.tasks" Condition="'$(MSBuildProjectName)' != 'RepoTasks' AND '$(DesignTimeBuild)' != 'true'" />
 
   <Import Project="eng\Dependencies.props" />
   <Import Project="eng\PatchConfig.props" />

build.ps1

@@ -242,12 +242,13 @@ elseif ($Projects) {
 else {
     # When adding new sub-group build flags, add them to this check.
     if((-not $Native) -and (-not $Managed) -and (-not $NodeJS) -and (-not $Installers)) {
-        Write-Warning "No default group of projects was specified, so building the 'managed' subset of projects. Run ``build.cmd -help`` for more details."
+        Write-Warning "No default group of projects was specified, so building the 'managed' and 'native' subsets of projects. Run ``build.cmd -help`` for more details."
 
         # This goal of this is to pick a sensible default for `build.cmd` with zero arguments.
-        # We believe the most common thing our contributors will work on is C#, so if no other build group was picked, build the C# projects.
+        # Now that we support subfolder invokations of build.cmd, we will be pushing to have build.cmd build everything (-all) by default
 
         $Managed = $true
+        $Native = $true
     }
 
     $MSBuildArguments += "/p:BuildManaged=$Managed"

build/repo.targets

@@ -168,14 +168,14 @@
     <Move SourceFiles="%(SubmoduleGlobalJsonFiles.BackupPath)" DestinationFiles="%(SubmoduleGlobalJsonFiles.Identity)" Condition="Exists(%(SubmoduleGlobalJsonFiles.BackupPath))" />
 
     <!-- Join required because shipping category is stored in artifact.props (PackageArtifact), but information about package ID and version comes from repos (ArtifactInfo). -->
-    <RepoTasks.JoinItems
+    <RepoTasks.JoinRepoItems
       Left="@(_Temp)"
       LeftMetadata="*"
       Right="@(ArtifactInfo->WithMetadataValue('ArtifactType','NuGetPackage'));@(ShippedArtifactInfo->WithMetadataValue('ArtifactType','NuGetPackage'))"
       RightKey="PackageId"
       RightMetadata="Version">
       <Output TaskParameter="JoinResult" ItemName="PackageArtifact" />
-    </RepoTasks.JoinItems>
+    </RepoTasks.JoinRepoItems>
 
     <ItemGroup>
       <_PackageArtifactWithoutMatchingInfo Include="@(_Temp)" Exclude="@(PackageArtifact)" />

build/tasks/JoinItems.cs renamed to build/tasks/JoinRepoItems.cs

@@ -10,7 +10,7 @@
 
 namespace RepoTasks
 {
-    public class JoinItems : Task
+    public class JoinRepoItems : Task
     {
         [Required]
         public ITaskItem[] Left { get; set; }

build/tasks/RepoTasks.tasks

@@ -6,7 +6,7 @@
   <UsingTask TaskName="RepoTasks.GenerateRestoreSourcesPropsFile" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.GenerateGuid" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.GetMsiProperty" AssemblyFile="$(_RepoTaskAssembly)" />
-  <UsingTask TaskName="RepoTasks.JoinItems" AssemblyFile="$(_RepoTaskAssembly)" />
+  <UsingTask TaskName="RepoTasks.JoinRepoItems" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.OrderBy" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.GenerateSharedFrameworkMetadataFiles" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.PublishToAzureBlob" AssemblyFile="$(_RepoTaskAssembly)" />

docs/BuildFromSource.md

@@ -61,13 +61,14 @@ Before opening our .sln files in Visual Studio or VS Code, you need to perform t
 
 1. Executing the following on command-line:
    ```
-   .\build.cmd
+   .\restore.cmd
    ```
    This will download required tools and build the entire repository once. At that point, you should be able to open .sln files to work on the projects you care about.
 
-2. Use the `startvs.cmd` script to open Visual Studio .sln files. This script first sets required environment variables.
+   > :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. On the master branch, we regularly update the versions of .NET Core SDK required to build the repo.
+   > You will need to restart Visual Studio every time we update the .NET Core SDK.
 
-> :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. Visual Studio will only build projects in a solution file, and makes a best effort to use other files on disk. If you pull many changes, the files on disk may be stale and will need to re-build.
+2. Use the `startvs.cmd` script to open Visual Studio .sln files. This script first sets required environment variables.
 
 ### Solution files