Remove obsolete arcade-services submodule and upgrade to netcoreapp3.0 version of Darc. (#1368)

* Remove arcade-services submodule.

* Upgrade Darc to netcoreapp3.0 version and remove workaround.

* Remove a couple more references I missed.

Author: crummel

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "tools-local/arcade-services"]
-	path = tools-local/arcade-services
-	url = https://github.com/dotnet/arcade-services

DarcVersion.txt

@@ -1 +1 @@
-1.1.0-beta.19515.3
+1.1.0-beta.19568.2

build-source-tarball.sh

@@ -80,7 +80,7 @@ fi
 echo "Found bootstrap SDK $SDK_VERSION"
 CLI_PATH="$SCRIPT_ROOT/.dotnet"
 DarcVersion=$(cat $SCRIPT_ROOT/DarcVersion.txt)
-DARC_DLL="$CLI_PATH/tools/.store/microsoft.dotnet.darc/$DarcVersion/microsoft.dotnet.darc/$DarcVersion/tools/netcoreapp2.1/any/Microsoft.DotNet.Darc.dll"
+DARC_DLL="$CLI_PATH/tools/.store/microsoft.dotnet.darc/$DarcVersion/microsoft.dotnet.darc/$DarcVersion/tools/netcoreapp3.0/any/Microsoft.DotNet.Darc.dll"
 
 if [ $SKIP_BUILD -ne 1 ]; then
 
@@ -148,15 +148,11 @@ git submodule foreach --quiet --recursive '
 # Now re-uberclone into the tarball src directory.  Since we reuse the .gitdirs, this shouldn't hit the network at all.
 ignored_repos="https://dev.azure.com/dnceng/internal/_git/dotnet-optimization;https://dev.azure.com/devdiv/DevDiv/_git/DotNet-Trusted;https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted;https://[email protected]/dnceng/internal/_git/dotnet-optimization;https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup;https://github.com/dotnet/source-build-reference-packages"
 
-#export the LC_LIB_PATH for libgit2 so file as fedora fails to find it in the repodir
-export LD_LIBRARY_PATH=$CLI_PATH/tools/.store/microsoft.dotnet.darc/$DarcVersion/microsoft.dotnet.darc/$DarcVersion/tools/netcoreapp2.1/any/runtimes/rhel-x64/native/
-
 "$CLI_PATH/dotnet" "$DARC_DLL" clone --repos-folder=$TARBALL_ROOT/src/ --git-dir-folder $SCRIPT_ROOT/.git/modules/src/ --include-toolset --ignore-repos "$ignored_repos" --azdev-pat bogus --github-pat bogus --depth 0 --debug
 
 # now we don't need .git/modules/src or Darc anymore
 if [ $MINIMIZE_DISK_USAGE -eq 1 ]; then
     rm -rf "$SCRIPT_ROOT/.git/modules/src"
-    rm -rf $SCRIPT_ROOT/tools-local/arcade-services
 fi
 
 # then delete the master copies - we only need the specific hashes
@@ -197,10 +193,7 @@ cp -r $SCRIPT_ROOT/patches $TARBALL_ROOT/
 cp -r $SCRIPT_ROOT/scripts $TARBALL_ROOT/
 cp -r $SCRIPT_ROOT/repos $TARBALL_ROOT/
 cp -r $SCRIPT_ROOT/tools-local $TARBALL_ROOT/
-rm -rf $TARBALL_ROOT/tools-local/arcade-services/
-rm -rf $TARBALL_ROOT/.dotnet/shared/2.1.0/
 rm -rf $TARBALL_ROOT/.dotnet/tools/
-rm -rf $TARBALL_ROOT/.dotnet/host/fxr/2.1.0/
 cp -r $SCRIPT_ROOT/bin/git-info $TARBALL_ROOT/
 
 cp $SCRIPT_ROOT/support/tarball/build.sh $TARBALL_ROOT/build.sh

build.sh

@@ -69,9 +69,6 @@ export NUGET_PACKAGES="$scriptroot/packages/restored/"
 set -x
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 
-# runtime 2.1.0 required for darc
-"$scriptroot/eng/common/dotnet-install.sh"  -runtime dotnet -version 2.1.0
-
 if [ "$alternateTarget" == "true" ]; then
   CLIPATH="$scriptroot/.dotnet"
   SDKPATH="$CLIPATH/sdk/$SDK_VERSION"

dir.props

@@ -60,7 +60,7 @@
     <TaskDirectory>$(ToolsLocalDir)tasks/</TaskDirectory>
     <DarcInstallDir>$(DotNetCliToolDir)tools/</DarcInstallDir>
     <DarcVersion>$([System.IO.File]::ReadAllText('$(ProjectDir)DarcVersion.txt').Trim())</DarcVersion>
-    <DarcDll>$(DotNetCliToolDir)tools/.store/microsoft.dotnet.darc/$(DarcVersion)/microsoft.dotnet.darc/$(DarcVersion)/tools/netcoreapp2.1/any/Microsoft.DotNet.Darc.dll</DarcDll>
+    <DarcDll>$(DotNetCliToolDir)tools/.store/microsoft.dotnet.darc/$(DarcVersion)/microsoft.dotnet.darc/$(DarcVersion)/tools/netcoreapp3.0/any/Microsoft.DotNet.Darc.dll</DarcDll>
     <TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard2.0/</TasksBinDir>
     <SourceBuildTasksAssembly>$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll</SourceBuildTasksAssembly>
     <XPlatTasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks.XPlat/bin/Debug/netstandard2.0/</XPlatTasksBinDir>

tools-local/arcade-services

@@ -145,9 +145,9 @@
   </Target>
 
   <Target Name="AcquireDarc" Condition="'$(OfflineBuild)' != 'true'">
-    <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Building Darc." />
+    <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Installing Darc." />
     <Exec Command="$(ProjectDir)eng/common/darc-init.sh --darcversion $(DarcVersion) --toolpath $(DarcInstallDir)" />
-    <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Done building Darc." />
+    <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Done installing Darc." />
   </Target>
 
   <Target Name="FetchSources" Condition="'$(OfflineBuild)' != 'true'" DependsOnTargets="AcquireDarc">