Skip to content

Commit 66e967a

Browse files
committed
Remove obsolete arcade-services submodule and upgrade to netcoreapp3.0 version of Darc. (dotnet#1368)
* Remove arcade-services submodule. * Upgrade Darc to netcoreapp3.0 version and remove workaround. * Remove a couple more references I missed.
1 parent 71ffa02 commit 66e967a

File tree

7 files changed

+5
-19
lines changed

7 files changed

+5
-19
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "tools-local/arcade-services"]
2-
path = tools-local/arcade-services
3-
url = https://github.com/dotnet/arcade-services

DarcVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.0-beta.19515.3
1+
1.1.0-beta.19568.2

build-source-tarball.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fi
8484
echo "Found bootstrap SDK $SDK_VERSION"
8585
CLI_PATH="$SCRIPT_ROOT/.dotnet"
8686
DarcVersion=$(cat $SCRIPT_ROOT/DarcVersion.txt)
87-
DARC_DLL="$CLI_PATH/tools/.store/microsoft.dotnet.darc/$DarcVersion/microsoft.dotnet.darc/$DarcVersion/tools/netcoreapp2.1/any/Microsoft.DotNet.Darc.dll"
87+
DARC_DLL="$CLI_PATH/tools/.store/microsoft.dotnet.darc/$DarcVersion/microsoft.dotnet.darc/$DarcVersion/tools/netcoreapp3.0/any/Microsoft.DotNet.Darc.dll"
8888

8989
if [ $SKIP_BUILD -ne 1 ]; then
9090

@@ -152,15 +152,11 @@ git submodule foreach --quiet --recursive '
152152
# Now re-uberclone into the tarball src directory. Since we reuse the .gitdirs, this shouldn't hit the network at all.
153153
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"
154154

155-
#export the LC_LIB_PATH for libgit2 so file as fedora fails to find it in the repodir
156-
export LD_LIBRARY_PATH=$CLI_PATH/tools/.store/microsoft.dotnet.darc/$DarcVersion/microsoft.dotnet.darc/$DarcVersion/tools/netcoreapp2.1/any/runtimes/rhel-x64/native/
157-
158155
"$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
159156

160157
# now we don't need .git/modules/src or Darc anymore
161158
if [ $MINIMIZE_DISK_USAGE -eq 1 ]; then
162159
rm -rf "$SCRIPT_ROOT/.git/modules/src"
163-
rm -rf $SCRIPT_ROOT/tools-local/arcade-services
164160
fi
165161

166162
# then delete the master copies - we only need the specific hashes
@@ -209,10 +205,7 @@ cp -r $SCRIPT_ROOT/patches $TARBALL_ROOT/
209205
cp -r $SCRIPT_ROOT/scripts $TARBALL_ROOT/
210206
cp -r $SCRIPT_ROOT/repos $TARBALL_ROOT/
211207
cp -r $SCRIPT_ROOT/tools-local $TARBALL_ROOT/
212-
rm -rf $TARBALL_ROOT/tools-local/arcade-services/
213-
rm -rf $TARBALL_ROOT/.dotnet/shared/2.1.0/
214208
rm -rf $TARBALL_ROOT/.dotnet/tools/
215-
rm -rf $TARBALL_ROOT/.dotnet/host/fxr/2.1.0/
216209
cp -r $SCRIPT_ROOT/bin/git-info $TARBALL_ROOT/
217210

218211
cp $SCRIPT_ROOT/support/tarball/build.sh $TARBALL_ROOT/build.sh

build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ export NUGET_PACKAGES="$scriptroot/packages/restored/"
6969
set -x
7070
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
7171

72-
# runtime 2.1.0 required for darc
73-
"$scriptroot/eng/common/dotnet-install.sh" -runtime dotnet -version 2.1.0
74-
7572
if [ "$alternateTarget" == "true" ]; then
7673
CLIPATH="$scriptroot/.dotnet"
7774
SDKPATH="$CLIPATH/sdk/$SDK_VERSION"

dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<TaskDirectory>$(ToolsLocalDir)tasks/</TaskDirectory>
6161
<DarcInstallDir>$(DotNetCliToolDir)tools/</DarcInstallDir>
6262
<DarcVersion>$([System.IO.File]::ReadAllText('$(ProjectDir)DarcVersion.txt').Trim())</DarcVersion>
63-
<DarcDll>$(DotNetCliToolDir)tools/.store/microsoft.dotnet.darc/$(DarcVersion)/microsoft.dotnet.darc/$(DarcVersion)/tools/netcoreapp2.1/any/Microsoft.DotNet.Darc.dll</DarcDll>
63+
<DarcDll>$(DotNetCliToolDir)tools/.store/microsoft.dotnet.darc/$(DarcVersion)/microsoft.dotnet.darc/$(DarcVersion)/tools/netcoreapp3.0/any/Microsoft.DotNet.Darc.dll</DarcDll>
6464
<TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard2.0/</TasksBinDir>
6565
<SourceBuildTasksAssembly>$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll</SourceBuildTasksAssembly>
6666
<XPlatTasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks.XPlat/bin/Debug/netstandard2.0/</XPlatTasksBinDir>

tools-local/arcade-services

Lines changed: 0 additions & 1 deletion
This file was deleted.

tools-local/init-build.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@
146146
</Target>
147147

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

154154
<Target Name="FetchSources" Condition="'$(OfflineBuild)' != 'true'" DependsOnTargets="AcquireDarc">

0 commit comments

Comments
 (0)