Skip to content

Commit 29bdf0c

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210428.7 (#33400)
[release/3.1] Update dependencies from dotnet/arcade
1 parent 35176d1 commit 29bdf0c

File tree

8 files changed

+228
-21
lines changed

8 files changed

+228
-21
lines changed

‎NuGet.config

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
7-
<add key="darc-int-dotnet-aspnetcore-tooling-198cc5e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-198cc5ec/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
98
<!-- Begin: Package sources from dotnet-corefx -->
10-
<add key="darc-int-dotnet-corefx-658544b" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-658544bf/nuget/v3/index.json" />
119
<!-- End: Package sources from dotnet-corefx -->
1210
<!-- Begin: Package sources from dotnet-core-setup -->
13-
<add key="darc-int-dotnet-core-setup-4c6b4aa" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-4c6b4aa2/nuget/v3/index.json" />
1411
<!-- End: Package sources from dotnet-core-setup -->
1512
<!-- Begin: Package sources from dotnet-efcore -->
16-
<add key="darc-int-dotnet-efcore-d3e6b71" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-d3e6b717/nuget/v3/index.json" />
1713
<!-- End: Package sources from dotnet-efcore -->
1814
<!-- Begin: Package sources from dotnet-extensions -->
19-
<add key="darc-int-dotnet-extensions-6093862" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-60938620/nuget/v3/index.json" />
2015
<!-- End: Package sources from dotnet-extensions -->
2116
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2217
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
@@ -29,20 +24,15 @@
2924
<clear />
3025
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3126
<!-- Begin: Package sources from dotnet-extensions -->
32-
<add key="darc-int-dotnet-extensions-6093862" value="true" />
3327
<!-- End: Package sources from dotnet-extensions -->
3428
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
35-
<add key="darc-int-dotnet-aspnetcore-tooling-198cc5e" value="true" />
3629
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
3730
<!-- Begin: Package sources from dotnet-efcore -->
38-
<add key="darc-int-dotnet-efcore-d3e6b71" value="true" />
3931
<!-- End: Package sources from dotnet-efcore -->
4032
<!-- Begin: Package sources from dotnet-core-setup -->
41-
<add key="darc-int-dotnet-core-setup-4c6b4aa" value="true" />
4233
<!-- End: Package sources from dotnet-core-setup -->
4334
<!-- Begin: Package sources from dotnet-corefx -->
44-
<add key="darc-int-dotnet-corefx-658544b" value="true" />
4535
<!-- End: Package sources from dotnet-corefx -->
4636
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4737
</disabledPackageSources>
48-
</configuration>
38+
</configuration>

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -418,17 +418,17 @@
418418
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
419419
<Sha>60938620996db86debee5cf1652e70a6ec5cb3e7</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21161.1">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21228.7">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>9467b1074927ee3fe98d539d3b72f5686c861958</Sha>
423+
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21161.1">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21228.7">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>9467b1074927ee3fe98d539d3b72f5686c861958</Sha>
427+
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
428428
</Dependency>
429-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21161.1">
429+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21228.7">
430430
<Uri>https://github.com/dotnet/arcade</Uri>
431-
<Sha>9467b1074927ee3fe98d539d3b72f5686c861958</Sha>
431+
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
432432
</Dependency>
433433
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.16-servicing.21262.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
434434
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
-->
6565
<PropertyGroup Label="Automated">
6666
<!-- Packages from dotnet/arcade -->
67-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21161.1</MicrosoftDotNetGenAPIPackageVersion>
67+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21228.7</MicrosoftDotNetGenAPIPackageVersion>
6868
<!-- Packages from dotnet/roslyn -->
6969
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
7070
<!-- Packages from dotnet/core-setup -->

‎eng/common/generate-locproject.ps1

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
Param(
2+
[Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here
3+
[string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json
4+
[switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one
5+
[switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally
6+
)
7+
8+
# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here:
9+
# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task
10+
11+
Set-StrictMode -Version 2.0
12+
$ErrorActionPreference = "Stop"
13+
. $PSScriptRoot\tools.ps1
14+
15+
Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
16+
17+
$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json"
18+
$exclusions = @{ Exclusions = @() }
19+
if (Test-Path -Path $exclusionsFilePath)
20+
{
21+
$exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json
22+
}
23+
24+
Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work
25+
26+
# Template files
27+
$jsonFiles = @()
28+
$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern
29+
$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
30+
31+
$xlfFiles = @()
32+
33+
$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf"
34+
$langXlfFiles = @()
35+
if ($allXlfFiles) {
36+
$null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf'
37+
$firstLangCode = $Matches.1
38+
$langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf"
39+
}
40+
$langXlfFiles | ForEach-Object {
41+
$null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf'
42+
43+
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
44+
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
45+
}
46+
47+
$locFiles = $jsonFiles + $xlfFiles
48+
49+
$locJson = @{
50+
Projects = @(
51+
@{
52+
LanguageSet = $LanguageSet
53+
LocItems = @(
54+
$locFiles | ForEach-Object {
55+
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
56+
$continue = $true
57+
foreach ($exclusion in $exclusions.Exclusions) {
58+
if ($outputPath.Contains($exclusion))
59+
{
60+
$continue = $false
61+
}
62+
}
63+
$sourceFile = ($_.FullName | Resolve-Path -Relative)
64+
if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') {
65+
Remove-Item -Path $sourceFile
66+
}
67+
if ($continue)
68+
{
69+
if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') {
70+
return @{
71+
SourceFile = $sourceFile
72+
CopyOption = "LangIDOnPath"
73+
OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
74+
}
75+
}
76+
else {
77+
return @{
78+
SourceFile = $sourceFile
79+
CopyOption = "LangIDOnName"
80+
OutputPath = $outputPath
81+
}
82+
}
83+
}
84+
}
85+
)
86+
}
87+
)
88+
}
89+
90+
$json = ConvertTo-Json $locJson -Depth 5
91+
Write-Host "LocProject.json generated:`n`n$json`n`n"
92+
Pop-Location
93+
94+
if (!$UseCheckedInLocProjectJson) {
95+
New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
96+
Set-Content "$SourcesDirectory\Localize\LocProject.json" $json
97+
}
98+
else {
99+
New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
100+
Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
101+
102+
if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
103+
Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
104+
105+
exit 1
106+
}
107+
else {
108+
Write-Host "Generated LocProject.json and current LocProject.json are identical."
109+
}
110+
}

‎eng/common/templates/job/onelocbuild.yml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
parameters:
2+
# Optional: dependencies of the job
3+
dependsOn: ''
4+
5+
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
6+
pool:
7+
vmImage: vs2017-win2016
8+
9+
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
10+
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
11+
12+
SourcesDirectory: $(Build.SourcesDirectory)
13+
CreatePr: true
14+
AutoCompletePr: false
15+
UseCheckedInLocProjectJson: false
16+
LanguageSet: VS_Main_Languages
17+
LclSource: lclFilesInRepo
18+
LclPackageId: ''
19+
RepoType: gitHub
20+
condition: ''
21+
22+
jobs:
23+
- job: OneLocBuild
24+
25+
dependsOn: ${{ parameters.dependsOn }}
26+
27+
displayName: OneLocBuild
28+
29+
pool: ${{ parameters.pool }}
30+
31+
variables:
32+
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
33+
- name: _GenerateLocProjectArguments
34+
value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
35+
-LanguageSet "${{ parameters.LanguageSet }}"
36+
-CreateNeutralXlfs
37+
- ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
38+
- name: _GenerateLocProjectArguments
39+
value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
40+
41+
42+
steps:
43+
- task: Powershell@2
44+
inputs:
45+
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
46+
arguments: $(_GenerateLocProjectArguments)
47+
displayName: Generate LocProject.json
48+
condition: ${{ parameters.condition }}
49+
50+
- task: OneLocBuild@2
51+
displayName: OneLocBuild
52+
env:
53+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
54+
inputs:
55+
locProj: Localize/LocProject.json
56+
outDir: $(Build.ArtifactStagingDirectory)
57+
lclSource: ${{ parameters.LclSource }}
58+
lclPackageId: ${{ parameters.LclPackageId }}
59+
isCreatePrSelected: ${{ parameters.CreatePr }}
60+
${{ if eq(parameters.CreatePr, true) }}:
61+
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
62+
packageSourceAuth: patAuth
63+
patVariable: ${{ parameters.CeapexPat }}
64+
${{ if eq(parameters.RepoType, 'gitHub') }}:
65+
repoType: ${{ parameters.RepoType }}
66+
gitHubPatVariable: "${{ parameters.GithubPat }}"
67+
condition: ${{ parameters.condition }}
68+
69+
- task: PublishBuildArtifacts@1
70+
displayName: Publish Localization Files
71+
inputs:
72+
PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc'
73+
PublishLocation: Container
74+
ArtifactName: Loc
75+
condition: ${{ parameters.condition }}
76+
77+
- task: PublishBuildArtifacts@1
78+
displayName: Publish LocProject.json
79+
inputs:
80+
PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
81+
PublishLocation: Container
82+
ArtifactName: Loc
83+
condition: ${{ parameters.condition }}

‎eng/common/templates/post-build/post-build.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,30 @@ stages:
391391
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
392392
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
393393

394+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
395+
parameters:
396+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
397+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
398+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
399+
stageName: 'VS16_11_Publishing'
400+
channelName: 'VS 16.11'
401+
channelId: 1926
402+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
403+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
404+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
405+
406+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
407+
parameters:
408+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
409+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
410+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
411+
stageName: 'VS17_0_Publishing'
412+
channelName: 'VS 17.0'
413+
channelId: 1853
414+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
415+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
416+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
417+
394418
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
395419
parameters:
396420
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
323323
}
324324

325325
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
326-
return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\amd64\msbuild.exe"
326+
return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
327327
}
328328

329329
function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21161.1",
29-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21161.1"
28+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21228.7",
29+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21228.7"
3030
}
3131
}

0 commit comments

Comments
 (0)