Browse Source

[main] Update dependencies from dotnet/arcade (#1094)

[main] Update dependencies from dotnet/arcade
pull/1101/head
dotnet-maestro[bot] 5 years ago
committed by GitHub
parent
commit
4ed8c5bd5b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 13
      eng/common/generate-locproject.ps1
  3. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21317.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21321.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5619c32997ab2d6a5ddf6d2e488c572b882f891b</Sha>
<Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21317.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21321.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5619c32997ab2d6a5ddf6d2e488c572b882f891b</Sha>
<Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21317.1">
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21321.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5619c32997ab2d6a5ddf6d2e488c572b882f891b</Sha>
<Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21317.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21321.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5619c32997ab2d6a5ddf6d2e488c572b882f891b</Sha>
<Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21317.1">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21321.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5619c32997ab2d6a5ddf6d2e488c572b882f891b</Sha>
<Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>

13
eng/common/generate-locproject.ps1

@ -25,8 +25,15 @@ Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to
# Template files
$jsonFiles = @()
$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern
$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
$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
}
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
$xlfFiles = @()
@ -44,7 +51,7 @@ $langXlfFiles | ForEach-Object {
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
}
$locFiles = $jsonFiles + $xlfFiles
$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles
$locJson = @{
Projects = @(

2
global.json

@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21317.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.2"
}
}

Loading…
Cancel
Save