Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #149

Merged
merged 34 commits into from
Aug 16, 2022
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
168f4e1
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jun 17, 2022
106ed9a
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jun 22, 2022
35e66c5
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jun 23, 2022
9131afd
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jun 24, 2022
6059d24
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jun 25, 2022
eebac9f
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jun 27, 2022
e0be407
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jun 28, 2022
725756c
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 5, 2022
bc67b09
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 6, 2022
c91e693
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 7, 2022
d3019b2
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 9, 2022
d14753c
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 13, 2022
0ad2288
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 14, 2022
4c3805a
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 15, 2022
74c9670
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 16, 2022
fc89935
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 18, 2022
4c0804f
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 19, 2022
5bce642
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 20, 2022
2976ef8
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 21, 2022
79f7f71
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 22, 2022
12d3f88
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 23, 2022
69fc709
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 26, 2022
11feaed
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 27, 2022
c04ea61
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 28, 2022
a5a1a5c
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 29, 2022
117e2ab
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 30, 2022
7e2ba34
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Aug 2, 2022
b2f6e85
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Aug 3, 2022
b8f7dde
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Aug 4, 2022
4431c60
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Aug 6, 2022
5da746d
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Aug 7, 2022
b1f63a7
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Aug 9, 2022
588d62a
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Aug 11, 2022
7775266
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Aug 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20220…
…706.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.22314.8 -> To Version 7.0.0-beta.22356.3
dotnet-maestro[bot] committed Jul 7, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit c91e6935e912859acc841082cc77d46f99d1438a
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22355.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22356.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9f45238c23d89cf44a10705db1217e66a441ba5a</Sha>
<Sha>78adce7e3545bf5a5252fd9963969d8950fadea6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22355.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22356.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9f45238c23d89cf44a10705db1217e66a441ba5a</Sha>
<Sha>78adce7e3545bf5a5252fd9963969d8950fadea6</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
14 changes: 6 additions & 8 deletions eng/common/generate-locproject.ps1
Original file line number Diff line number Diff line change
@@ -10,9 +10,7 @@ Param(

Set-StrictMode -Version 2.0
$ErrorActionPreference = "Stop"
. $PSScriptRoot\tools.ps1

Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
. $PSScriptRoot\pipeline-logging-functions.ps1

$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json"
$exclusions = @{ Exclusions = @() }
@@ -28,7 +26,7 @@ $jsonFiles = @()
$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern
$jsonTemplateFiles | ForEach-Object {
$null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json

$destinationFile = "$($_.Directory.FullName)\$($Matches.1).json"
$jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
}
@@ -46,7 +44,7 @@ if ($allXlfFiles) {
}
$langXlfFiles | ForEach-Object {
$null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf

$destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
}
@@ -59,7 +57,7 @@ $locJson = @{
LanguageSet = $LanguageSet
LocItems = @(
$locFiles | ForEach-Object {
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion))
@@ -108,10 +106,10 @@ else {

if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) {
Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."

exit 1
}
else {
Write-Host "Generated LocProject.json and current LocProject.json are identical."
}
}
}
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
"xcopy-msbuild": "16.8.0-preview2.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22355.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22355.4"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22356.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22356.3"
}
}