From 804050874c1aa7ef56c9ab76350f2d4b419e0d8f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 18 May 2023 18:22:48 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#16432)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- Microsoft.SourceLink.GitHub: from 8.0.0-beta.23218.3 to 8.0.0-beta.23252.2 (parent: Microsoft.DotNet.Arcade.Sdk)
- Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23263.1 to 1.0.0-beta.23266.1 (parent: Microsoft.DotNet.Arcade.Sdk)
- Remove integrated source build patch
---
eng/Version.Details.xml | 20 ++++++------
eng/Versions.props | 2 +-
global.json | 4 +--
...3-Workaround-for-msbuild-cache-issue.patch | 31 -------------------
4 files changed, 13 insertions(+), 44 deletions(-)
delete mode 100644 src/SourceBuild/patches/sourcelink/0003-Workaround-for-msbuild-cache-issue.patch
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8aab6135b..f1f6f42d8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -193,18 +193,18 @@
-
+
https://github.com/dotnet/arcade
- 2d8d59065b5e090584a8e90c4371fc06ed60bdc5
+ f4269875971171c278c2cd695e9ef94b6516e4be
-
+
https://github.com/dotnet/arcade
- 2d8d59065b5e090584a8e90c4371fc06ed60bdc5
+ f4269875971171c278c2cd695e9ef94b6516e4be
-
+
https://github.com/dotnet/arcade
- 2d8d59065b5e090584a8e90c4371fc06ed60bdc5
+ f4269875971171c278c2cd695e9ef94b6516e4be
https://github.com/dotnet/arcade-services
@@ -223,14 +223,14 @@
fd98754b692a1a8da2aaadd28ce3952578d9d9ad
-
+
https://github.com/dotnet/sourcelink
- 47c52dd2ebf9edfd40abdcff999c13eb461f6ce2
+ 54eb3b811c57f5e94617d31a102fc9cb664ccdd5
-
+
https://github.com/dotnet/xliff-tasks
- 3f7d6c7e742012d9437fcb0d04cac63202d37621
+ 9e7fbcab4e5275f63c0cd37553ba426de9194309
diff --git a/eng/Versions.props b/eng/Versions.props
index 71e152bb7..03ac6886e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -33,7 +33,7 @@
- 8.0.0-beta.23265.1
+ 8.0.0-beta.23268.1
diff --git a/global.json b/global.json
index 50c5ec5f2..a6aba9343 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23265.1",
- "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23265.1"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23268.1",
+ "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23268.1"
}
}
diff --git a/src/SourceBuild/patches/sourcelink/0003-Workaround-for-msbuild-cache-issue.patch b/src/SourceBuild/patches/sourcelink/0003-Workaround-for-msbuild-cache-issue.patch
deleted file mode 100644
index dc9308c13..000000000
--- a/src/SourceBuild/patches/sourcelink/0003-Workaround-for-msbuild-cache-issue.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: tmat
-Date: Fri, 21 Apr 2023 09:02:35 -0700
-Subject: [PATCH] Workaround for msbuild cache issue
-
-Backport: https://github.com/dotnet/sourcelink/pull/1008
----
- src/Microsoft.Build.Tasks.Git/RepositoryTask.cs | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/Microsoft.Build.Tasks.Git/RepositoryTask.cs b/src/Microsoft.Build.Tasks.Git/RepositoryTask.cs
-index 9647abf..ef838b5 100644
---- a/src/Microsoft.Build.Tasks.Git/RepositoryTask.cs
-+++ b/src/Microsoft.Build.Tasks.Git/RepositoryTask.cs
-@@ -147,7 +147,15 @@ private string GetCacheKey(string repositoryId)
-
- private bool TryGetCachedRepositoryInstance(string cacheKey, bool requireCached, [NotNullWhen(true)]out GitRepository? repository)
- {
-- var entry = (StrongBox)BuildEngine4.GetRegisteredTaskObject(cacheKey, RegisteredTaskObjectLifetime.Build);
-+ StrongBox? entry;
-+ try
-+ {
-+ entry = (StrongBox?)BuildEngine4.GetRegisteredTaskObject(cacheKey, RegisteredTaskObjectLifetime.Build);
-+ }
-+ catch (InvalidCastException) // workaround for https://github.com/dotnet/msbuild/issues/8478
-+ {
-+ entry = null;
-+ }
-
- if (entry != null)
- {