Remove unnecessary patches (#14200)

This commit is contained in:
Michael Simons 2022-07-26 12:37:47 -05:00 committed by GitHub
parent e7f755308e
commit 9fae129964
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 69 deletions

View file

@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
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

View file

@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
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

View file

@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
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