From 29ec382cfa5686094a07c4c3e746c1da06064b51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 13:26:12 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20230218.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23110.3 -> To Version 8.0.0-beta.23118.1 --- eng/Version.Details.xml | 4 ++-- eng/common/generate-locproject.ps1 | 9 +++++++-- global.json | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aab61b4f6e..56b8f4b7fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 96d8be74c39a4765ec919ff9bebf9e0c875fc195 + 38d3196e1596eb525367ec8d65fcc1f30a58261c diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index bcb579e37a..524aaa57f2 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 aa641e5448..7fde77c656 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23118.1" } }