diff --git a/.gitmodules b/.gitmodules
index 58fe73dce4..e69de29bb2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "tools-local/arcade-services"]
- path = tools-local/arcade-services
- url = https://github.com/dotnet/arcade-services
diff --git a/DarcVersion.txt b/DarcVersion.txt
index f7b6a8196d..3574ff786b 100644
--- a/DarcVersion.txt
+++ b/DarcVersion.txt
@@ -1 +1 @@
-1.1.0-beta.19515.3
\ No newline at end of file
+1.1.0-beta.19568.2
diff --git a/build-source-tarball.sh b/build-source-tarball.sh
index 109b3aa546..cc3152ceef 100755
--- a/build-source-tarball.sh
+++ b/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://dnceng@dev.azure.com/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
diff --git a/build.sh b/build.sh
index cba68e98c3..d582864d41 100755
--- a/build.sh
+++ b/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"
diff --git a/dir.props b/dir.props
index 9b28ac7f4c..82582054d6 100644
--- a/dir.props
+++ b/dir.props
@@ -60,7 +60,7 @@
$(ToolsLocalDir)tasks/
$(DotNetCliToolDir)tools/
$([System.IO.File]::ReadAllText('$(ProjectDir)DarcVersion.txt').Trim())
- $(DotNetCliToolDir)tools/.store/microsoft.dotnet.darc/$(DarcVersion)/microsoft.dotnet.darc/$(DarcVersion)/tools/netcoreapp2.1/any/Microsoft.DotNet.Darc.dll
+ $(DotNetCliToolDir)tools/.store/microsoft.dotnet.darc/$(DarcVersion)/microsoft.dotnet.darc/$(DarcVersion)/tools/netcoreapp3.0/any/Microsoft.DotNet.Darc.dll
$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard2.0/
$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll
$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks.XPlat/bin/Debug/netstandard2.0/
diff --git a/tools-local/arcade-services b/tools-local/arcade-services
deleted file mode 160000
index e9a0a535da..0000000000
--- a/tools-local/arcade-services
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e9a0a535da74bd2a4cda87a9688b7094e5745b33
diff --git a/tools-local/init-build.proj b/tools-local/init-build.proj
index d20e6b1ecc..236b1174a5 100644
--- a/tools-local/init-build.proj
+++ b/tools-local/init-build.proj
@@ -145,9 +145,9 @@
-
+
-
+