From 9fae129964a364bd4468a127fe30c83af109cd92 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 26 Jul 2022 12:37:47 -0500 Subject: [PATCH] Remove unnecessary patches (#14200) --- ...assemblies-in-net6.0-artifacts-direc.patch | 23 ------------------- ...assemblies-in-net6.0-artifacts-direc.patch | 23 ------------------- ...assemblies-in-net6.0-artifacts-direc.patch | 23 ------------------- 3 files changed, 69 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch delete mode 100644 src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch delete mode 100644 src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch diff --git a/src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch b/src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch deleted file mode 100644 index 7081e95e8..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 25 Apr 2022 15:07:55 -0700 -Subject: [PATCH] look for arcade assemblies in net6.0 artifacts directory - -Workaround for: https://github.com/dotnet/arcade/pull/9127 ---- - eng/common/tools.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 17f0a365..f8852dbb 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -435,6 +435,8 @@ function MSBuild { - possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) -+ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.ArcadeLogging.dll" ) -+ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.Arcade.Sdk.dll" ) - for path in "${possiblePaths[@]}"; do - if [[ -f $path ]]; then - selectedPath=$path diff --git a/src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch b/src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch deleted file mode 100644 index 7081e95e8..000000000 --- a/src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 25 Apr 2022 15:07:55 -0700 -Subject: [PATCH] look for arcade assemblies in net6.0 artifacts directory - -Workaround for: https://github.com/dotnet/arcade/pull/9127 ---- - eng/common/tools.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 17f0a365..f8852dbb 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -435,6 +435,8 @@ function MSBuild { - possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) -+ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.ArcadeLogging.dll" ) -+ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.Arcade.Sdk.dll" ) - for path in "${possiblePaths[@]}"; do - if [[ -f $path ]]; then - selectedPath=$path diff --git a/src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch b/src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch deleted file mode 100644 index 7081e95e8..000000000 --- a/src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 25 Apr 2022 15:07:55 -0700 -Subject: [PATCH] look for arcade assemblies in net6.0 artifacts directory - -Workaround for: https://github.com/dotnet/arcade/pull/9127 ---- - eng/common/tools.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 17f0a365..f8852dbb 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -435,6 +435,8 @@ function MSBuild { - possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) -+ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.ArcadeLogging.dll" ) -+ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.Arcade.Sdk.dll" ) - for path in "${possiblePaths[@]}"; do - if [[ -f $path ]]; then - selectedPath=$path