Merge 'dotnet/master' into 5.0.2

Author: dagood

eng/SourceBuild.Tarball.targets

@@ -270,23 +270,6 @@
       <IncludedPrebuiltPackageFile
         Include="@(IncludedPrebuiltPackageFilename -> '%(OriginalIdentity)')" />
 
-      <!--
-        These Arcade prebuilts cannot be ref-pkgs because they get included in Arcade.
-        This should be temporary until nuget is built in 5.0.
-      -->
-      <ArcadePrebuiltPackageFilename Include="
-        nuget.versioning.4.4.0.nupkg;
-        system.memory.4.5.3.nupkg" />
-      <!--
-        Eval '**' separately: Filename and Extension metadata doesn't work in the same element where
-        matching happens, for items declared in targets.
-      -->
-      <ArcadePrebuiltPackageFile
-        Include="$(ProjectDir)packages\restored\**\%(ArcadePrebuiltPackageFilename.Identity)" />
-      <IncludedPrebuiltPackageFile
-        Include="@(ArcadePrebuiltPackageFile)"
-        RelativeDestination="packages\arcadeRequired\%(Filename)%(Extension)" />
-
       <!-- Add prebuilt packages to tarball. -->
       <TarballCopyFile Include="@(IncludedPrebuiltPackageFile)" />
     </ItemGroup>

eng/Versions.props

@@ -13,4 +13,7 @@
   <PropertyGroup>
     <PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20623.1</PrivateSourceBuildReferencePackagesPackageVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.100-920491-20201216</PrivateSourceBuiltArtifactsPackageVersion>
+  </PropertyGroup>
 </Project>

repos/arcade.proj

@@ -2,8 +2,6 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <!-- Include extra arcade required prebuilts in offline build only-->
-    <ExtraRestoreSourcePath Condition="'$(OfflineBuild)' == 'true'">$(ProjectDir)packages/arcadeRequired/</ExtraRestoreSourcePath>
     <!-- 'restore' and 'build' switches automatically passed by build.sh/ps1. -->
     <BuildCommandArgs />
     <BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)pack</BuildCommandArgs>