From 99845449913c82160dd0948dae64328785233351 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 18 Feb 2023 13:29:41 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20230217.2 (#1541)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/generate-locproject.ps1 | 9 +++++++--
global.json | 2 +-
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index df7fb193..dd8e59f3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 83284ab08840fe5f429ecd9fa935e81527023553
+ 53902aeb8989149b43592475fbb143b6bfe5297f
-
+
https://github.com/dotnet/arcade
- 83284ab08840fe5f429ecd9fa935e81527023553
+ 53902aeb8989149b43592475fbb143b6bfe5297f
-
+
https://github.com/dotnet/arcade
- 83284ab08840fe5f429ecd9fa935e81527023553
+ 53902aeb8989149b43592475fbb143b6bfe5297f
-
+
https://github.com/dotnet/arcade
- 83284ab08840fe5f429ecd9fa935e81527023553
+ 53902aeb8989149b43592475fbb143b6bfe5297f
-
+
https://github.com/dotnet/arcade
- 83284ab08840fe5f429ecd9fa935e81527023553
+ 53902aeb8989149b43592475fbb143b6bfe5297f
https://github.com/dotnet/arcade-services
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index bcb579e3..524aaa57 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -45,7 +45,7 @@ if (-not $wxlFiles) {
}
}
-$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
+$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files
$macosHtmlFiles = @()
if ($macosHtmlEnFiles) {
$macosHtmlEnFiles | ForEach-Object {
@@ -148,12 +148,17 @@ $locJson = @{
}
}
$sourceFile = ($_.FullName | Resolve-Path -Relative)
+ $lciFile = $sourceFile + ".lci"
if ($continue) {
- return @{
+ $result = @{
SourceFile = $sourceFile
CopyOption = "LangIDOnPath"
OutputPath = $outputPath
}
+ if (Test-Path $lciFile -PathType Leaf) {
+ $result["LciFile"] = $lciFile
+ }
+ return $result
}
}
)
diff --git a/global.json b/global.json
index b6d42a32..7ea2f475 100644
--- a/global.json
+++ b/global.json
@@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23115.1"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23117.2"
}
}