diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c41e9f56c..70f3371a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -175,11 +175,6 @@ 90bdf447e1b97605f109b34243ab8c9f215308e9 - - https://github.com/dotnet/clicommandlineparser - 3198bf5660cad3dab85f5475bf1fda9688146e3f - - https://github.com/dotnet/deployment-tools 7431bf2f3c204cbbc326c8d55ce4ac5cad7661d6 diff --git a/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj b/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj deleted file mode 100644 index e4d90c5ec..000000000 --- a/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj +++ /dev/null @@ -1,26 +0,0 @@ - - - - - true - $(StandardSourceBuildArgs) - $(BuildCommandArgs) $(FlagParameterPrefix)v $(LogVerbosity) - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false - $(StandardSourceBuildCommand) $(BuildCommandArgs) - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - - - - - - - - - - - - diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index 712d7cd14..14c057b10 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -55,7 +55,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index eab516290..17bafb6ab 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -31,7 +31,6 @@ - diff --git a/src/SourceBuild/tarball/content/repos/templating.proj b/src/SourceBuild/tarball/content/repos/templating.proj index 7cc53299c..186bd3542 100644 --- a/src/SourceBuild/tarball/content/repos/templating.proj +++ b/src/SourceBuild/tarball/content/repos/templating.proj @@ -14,7 +14,6 @@ - diff --git a/src/SourceBuild/tarball/patches/clicommandlineparser/0001-Remove-installation-of-runtime-2.1.0-from-build.sh.patch b/src/SourceBuild/tarball/patches/clicommandlineparser/0001-Remove-installation-of-runtime-2.1.0-from-build.sh.patch deleted file mode 100644 index 1ebf01f83..000000000 --- a/src/SourceBuild/tarball/patches/clicommandlineparser/0001-Remove-installation-of-runtime-2.1.0-from-build.sh.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3110caf93828aad2ecfe9929e03dc4dd6dd85c5d Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 28 Jul 2021 15:56:35 +0000 -Subject: [PATCH] Remove installation of runtime 2.1.0 from build.sh - -Installation of another runtime in build.sh doesn't work for source-build -when building offline. ---- - build.sh | 3 --- - global.json | 7 ++++++- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/build.sh b/build.sh -index d511e95..acc0e31 100755 ---- a/build.sh -+++ b/build.sh -@@ -8,7 +8,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli - done - ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - --# install the 2.1.0 runtime for running tests --"$ScriptRoot/eng/common/dotnet-install.sh" -runtime dotnet -version 2.1.0 -- - . "$ScriptRoot/eng/common/build.sh" --build --restore $@ -diff --git a/global.json b/global.json -index e276e30..347e455 100644 ---- a/global.json -+++ b/global.json -@@ -1,6 +1,11 @@ - { - "tools": { -- "dotnet": "5.0.201" -+ "dotnet": "5.0.201", -+ "runtimes": { -+ "dotnet": [ -+ "2.1.0" -+ ] -+ } - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21256.3" --- -2.31.1 -