From 117cc25c043395be86e90e36fc1b5726eaf1ce76 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 20 Jul 2023 22:29:15 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#16982)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- Microsoft.SourceLink.GitHub: from 8.0.0-beta.23360.2 to 8.0.0-beta.23361.2 (parent: Microsoft.DotNet.Arcade.Sdk)
- Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23326.1 to 1.0.0-beta.23368.1 (parent: Microsoft.DotNet.Arcade.Sdk)
- Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147
- Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147
- Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147
- Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147
- Update sourcelink patch
- Update sourcelink patch
- Remove sourcelink dependencies - deployment-tools
---
eng/Version.Details.xml | 20 +++++++--------
eng/Versions.props | 2 +-
eng/common/sdl/configure-sdl-tool.ps1 | 2 +-
global.json | 6 ++---
.../0001-Remove-sourcelink-dependencies.patch | 25 +++++++++++++++++++
.../0001-New-command-line-APIs.patch | 6 ++---
6 files changed, 43 insertions(+), 18 deletions(-)
create mode 100644 src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a99229f2d..27134c012 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -202,18 +202,18 @@
-
+
https://github.com/dotnet/arcade
- 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13
+ 9fba71ca242ef84c4b7696c380cc00efe734adb3
-
+
https://github.com/dotnet/arcade
- 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13
+ 9fba71ca242ef84c4b7696c380cc00efe734adb3
-
+
https://github.com/dotnet/arcade
- 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13
+ 9fba71ca242ef84c4b7696c380cc00efe734adb3
https://github.com/dotnet/arcade-services
@@ -232,14 +232,14 @@
529fbc2aad419d0c1551d6685cc68be33e62a996
-
+
https://github.com/dotnet/sourcelink
- a1eed1e0522f47f4fbf60ed5f8caef3679208d66
+ d2e046aec870a5a7601cc51c5607f34463cc2d42
-
+
https://github.com/dotnet/xliff-tasks
- 10a822a79bde97ca45faa76dc4ec33b85533728a
+ 3aa0b2b84cab7d94b9136547563d027fd78e82a6
diff --git a/eng/Versions.props b/eng/Versions.props
index b5aeeeb49..b4376e727 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
- 8.0.0-beta.23361.1
+ 8.0.0-beta.23369.2
diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1
index ee9eb8933..e4108e39d 100644
--- a/eng/common/sdl/configure-sdl-tool.ps1
+++ b/eng/common/sdl/configure-sdl-tool.ps1
@@ -93,7 +93,7 @@ try {
}
'binskim' {
if ($targetDirectory) {
- $tool.Args += "`"Target < $TargetDirectory`""
+ $tool.Args += "`"Target < $TargetDirectory\**`""
}
$tool.Args += $BinskimAdditionalRunConfigParams
}
diff --git a/global.json b/global.json
index 1cfc718cd..423ebf99c 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "8.0.100-preview.5.23303.2",
+ "dotnet": "8.0.100-preview.6.23330.14",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23361.1",
- "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23361.1"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23369.2",
+ "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23369.2"
}
}
diff --git a/src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch b/src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch
new file mode 100644
index 000000000..a9709002e
--- /dev/null
+++ b/src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nikola Milosavljevic
+Date: Thu, 20 Jul 2023 21:02:57 +0000
+Subject: [PATCH] Remove sourcelink dependencies
+
+Backport: https://github.com/dotnet/deployment-tools/issues/282
+---
+ eng/Tools.props | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/eng/Tools.props b/eng/Tools.props
+index e0c3314..c0569e2 100644
+--- a/eng/Tools.props
++++ b/eng/Tools.props
+@@ -5,10 +5,4 @@
+ <_RepoToolManifest Condition="'$(ContinuousIntegrationBuild)' == 'true'" />
+
+
+-
+-
+-
+-
+-
+-
+
diff --git a/src/SourceBuild/patches/sourcelink/0001-New-command-line-APIs.patch b/src/SourceBuild/patches/sourcelink/0001-New-command-line-APIs.patch
index 9b4e0d42e..5c82af344 100644
--- a/src/SourceBuild/patches/sourcelink/0001-New-command-line-APIs.patch
+++ b/src/SourceBuild/patches/sourcelink/0001-New-command-line-APIs.patch
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic
-Date: Mon, 17 Jul 2023 18:27:44 +0000
+Date: Mon, 17 Jul 2023 15:10:02 +0000
Subject: [PATCH] New command-line APIs
Backport: https://github.com/dotnet/sourcelink/pull/1068
@@ -26,7 +26,7 @@ index ed5441c..1873d27 100644
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
-index 0c3e675..fad95bd 100644
+index 44c9e21..d86dff5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,21 +1,21 @@
@@ -58,7 +58,7 @@ index 0c3e675..fad95bd 100644
+ 02fe27cd6a9b001c8feb7938e6ef4b3799745759
-
+
diff --git a/eng/Versions.props b/eng/Versions.props
index 994e10a..65ed6ee 100644
--- a/eng/Versions.props