diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index da74b22b8..dcafdd280 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -19,7 +19,7 @@
https://github.com/dotnet/llvm-project
- 75e182c26dbf5d9f8ccca0ac68ee63b0bebb17b8
+ 754d13817d834b716d339183e21aac7d2489c496
@@ -200,18 +200,18 @@
-
+
https://github.com/dotnet/arcade
- 34dff939b4a91e4693f78a856e0e055c1a3f3fba
+ 258a37cd6a7884f771d0f991d9f24d29e292abd0
-
+
https://github.com/dotnet/arcade
- 34dff939b4a91e4693f78a856e0e055c1a3f3fba
+ 258a37cd6a7884f771d0f991d9f24d29e292abd0
-
+
https://github.com/dotnet/arcade
- 34dff939b4a91e4693f78a856e0e055c1a3f3fba
+ 258a37cd6a7884f771d0f991d9f24d29e292abd0
https://github.com/dotnet/arcade-services
@@ -226,14 +226,14 @@
c1bc837421e41a673cb30bf670c0cdd83ac09b75
-
+
https://github.com/dotnet/sourcelink
- a74d21bcfa0f928b0cb1dab9fa6ff8a17248c584
+ 0bba6b2d342056cb3fb3906f25929a92e063c5f8
-
+
https://github.com/dotnet/xliff-tasks
- a125e2b00ca0add2a2a23e0ba67f8ae6a4b1a1ee
+ d106fdda2b3eda55f12e72977de336ab3afa1d91
diff --git a/eng/Versions.props b/eng/Versions.props
index 6e569e714..32c365eb1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,7 +26,7 @@
- 7.0.0-beta.22419.1
+ 7.0.0-beta.22424.3
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index 846e7950c..bab18543d 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -62,7 +62,7 @@ $locJson = @{
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
- if ($outputPath.Contains($exclusion))
+ if ($_.FullName.Contains($exclusion))
{
$continue = $false
}
@@ -98,7 +98,7 @@ $locJson = @{
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
- if ($outputPath.Contains($exclusion))
+ if ($_.FullName.Contains($exclusion))
{
$continue = $false
}
diff --git a/global.json b/global.json
index f0ab65167..62bb6aab6 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22419.1",
- "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22419.1"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22424.3",
+ "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22424.3"
}
}
diff --git a/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch b/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch
index 57846fba6..098694eff 100644
--- a/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch
+++ b/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch
@@ -16,8 +16,8 @@ index df77e9a199d6..19b99be1f71b 100644
+++ b/global.json
@@ -5,6 +5,6 @@
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1",
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3",
- "Microsoft.Build.Traversal": "2.0.2"
+ "Microsoft.Build.Traversal": "2.0.34"
}