Skip to content

Commit d0153e0

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20221012.2 (#44504)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI From Version 1.0.0-beta.22505.4 -> To Version 1.0.0-beta.22512.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b050f42 commit d0153e0

File tree

10 files changed

+73
-72
lines changed

10 files changed

+73
-72
lines changed

‎NuGet.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,13 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7-
<add key="darc-int-dotnet-efcore-a29a7e5" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-a29a7e57/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-efcore -->
98
<!-- Begin: Package sources from dotnet-extensions -->
10-
<add key="darc-int-dotnet-extensions-c62ee3d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-c62ee3d0/nuget/v3/index.json" />
119
<!-- Begin: Package sources from dotnet-razor-tooling -->
12-
<add key="darc-int-dotnet-razor-tooling-ff510da" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-razor-tooling-ff510daf/nuget/v3/index.json" />
1310
<!-- End: Package sources from dotnet-razor-tooling -->
1411
<!-- Begin: Package sources from dotnet-corefx -->
1512
<!-- End: Package sources from dotnet-corefx -->
1613
<!-- Begin: Package sources from dotnet-core-setup -->
17-
<add key="darc-int-dotnet-core-setup-6ea7191" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-6ea71919/nuget/v3/index.json" />
1814
<!-- End: Package sources from dotnet-core-setup -->
1915
<!-- End: Package sources from dotnet-extensions -->
2016
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -27,15 +23,11 @@
2723
<clear />
2824
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2925
<!-- Begin: Package sources from dotnet-core-setup -->
30-
<add key="darc-int-dotnet-core-setup-6ea7191" value="true" />
3126
<!-- Begin: Package sources from dotnet-efcore -->
32-
<add key="darc-int-dotnet-efcore-a29a7e5" value="true" />
3327
<!-- End: Package sources from dotnet-efcore -->
3428
<!-- Begin: Package sources from dotnet-extensions -->
35-
<add key="darc-int-dotnet-extensions-c62ee3d" value="true" />
3629
<!-- End: Package sources from dotnet-extensions -->
3730
<!-- Begin: Package sources from dotnet-razor-tooling -->
38-
<add key="darc-int-dotnet-razor-tooling-ff510da" value="true" />
3931
<!-- End: Package sources from dotnet-razor-tooling -->
4032
<!-- End: Package sources from dotnet-core-setup -->
4133
<!-- Begin: Package sources from dotnet-corefx -->

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@
418418
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
419419
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22505.4">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22512.2">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>ce5a281156dfae3c050e63c1f288b6a488e978fe</Sha>
423+
<Sha>869528d3af327eb6de19b414631280734dfe76e6</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22505.4">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22512.2">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>ce5a281156dfae3c050e63c1f288b6a488e978fe</Sha>
427+
<Sha>869528d3af327eb6de19b414631280734dfe76e6</Sha>
428428
</Dependency>
429429
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.30-servicing.22476.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
430430
<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.22505.4</MicrosoftDotNetGenAPIPackageVersion>
67+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22512.2</MicrosoftDotNetGenAPIPackageVersion>
6868
<!-- Packages from dotnet/roslyn -->
6969
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
7070
<!-- Packages from dotnet/core-setup -->

‎eng/common/init-tools-native.ps1

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -120,52 +120,61 @@ try {
120120
$NativeTools.PSObject.Properties | ForEach-Object {
121121
$ToolName = $_.Name
122122
$ToolVersion = $_.Value
123-
$LocalInstallerArguments = @{ ToolName = "$ToolName" }
124-
$LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
125-
$LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
126-
$LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
127-
$LocalInstallerArguments += @{ Version = "$ToolVersion" }
128-
129-
if ($Verbose) {
130-
$LocalInstallerArguments += @{ Verbose = $True }
131-
}
132-
if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
133-
if($Force) {
134-
$LocalInstallerArguments += @{ Force = $True }
135-
}
136-
}
137-
if ($Clean) {
138-
$LocalInstallerArguments += @{ Clean = $True }
123+
124+
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
125+
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding."
139126
}
140-
141-
Write-Verbose "Installing $ToolName version $ToolVersion"
142-
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
143-
& $InstallerPath @LocalInstallerArguments
144-
if ($LASTEXITCODE -Ne "0") {
145-
$errMsg = "$ToolName installation failed"
146-
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
147-
$showNativeToolsWarning = $true
148-
if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
149-
$showNativeToolsWarning = $false
150-
}
151-
if ($showNativeToolsWarning) {
152-
Write-Warning $errMsg
153-
}
154-
$toolInstallationFailure = $true
155-
} else {
156-
Write-Error $errMsg
157-
exit 1
158-
}
127+
}
128+
exit 0
129+
}
130+
} else {
131+
$NativeTools.PSObject.Properties | ForEach-Object {
132+
$ToolName = $_.Name
133+
$ToolVersion = $_.Value
134+
$LocalInstallerArguments = @{ ToolName = "$ToolName" }
135+
$LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
136+
$LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
137+
$LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
138+
$LocalInstallerArguments += @{ Version = "$ToolVersion" }
139+
140+
if ($Verbose) {
141+
$LocalInstallerArguments += @{ Verbose = $True }
142+
}
143+
if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
144+
if($Force) {
145+
$LocalInstallerArguments += @{ Force = $True }
159146
}
160147
}
161-
162-
if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
163-
exit 1
148+
if ($Clean) {
149+
$LocalInstallerArguments += @{ Clean = $True }
164150
}
151+
152+
Write-Verbose "Installing $ToolName version $ToolVersion"
153+
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
154+
& $InstallerPath @LocalInstallerArguments
155+
if ($LASTEXITCODE -Ne "0") {
156+
$errMsg = "$ToolName installation failed"
157+
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
158+
$showNativeToolsWarning = $true
159+
if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
160+
$showNativeToolsWarning = $false
161+
}
162+
if ($showNativeToolsWarning) {
163+
Write-Warning $errMsg
164+
}
165+
$toolInstallationFailure = $true
166+
} else {
167+
Write-Error $errMsg
168+
exit 1
169+
}
170+
}
171+
}
172+
173+
if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
174+
exit 1
165175
}
166176
}
167-
}
168-
else {
177+
} else {
169178
Write-Host "No native tools defined in global.json"
170179
exit 0
171180
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ parameters:
2222

2323
jobs:
2424
- job: OneLocBuild
25-
25+
2626
dependsOn: ${{ parameters.dependsOn }}
2727

2828
displayName: OneLocBuild
@@ -38,7 +38,7 @@ jobs:
3838
- ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
3939
- name: _GenerateLocProjectArguments
4040
value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
41-
41+
4242

4343
steps:
4444
- task: Powershell@2
@@ -81,4 +81,4 @@ jobs:
8181
PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
8282
PublishLocation: Container
8383
ArtifactName: Loc
84-
condition: ${{ parameters.condition }}
84+
condition: ${{ parameters.condition }}

‎eng/common/templates/jobs/jobs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ parameters:
2222
enabled: false
2323
# Optional: Include toolset dependencies in the generated graph files
2424
includeToolset: false
25-
25+
2626
# Optional: Include PublishTestResults task
2727
enablePublishTestResults: false
2828

@@ -49,7 +49,7 @@ parameters:
4949
jobs:
5050
- ${{ each job in parameters.jobs }}:
5151
- template: ../job/job.yml
52-
parameters:
52+
parameters:
5353
# pass along parameters
5454
${{ each parameter in parameters }}:
5555
${{ if ne(parameter.key, 'jobs') }}:
@@ -79,7 +79,7 @@ jobs:
7979
runAsPublic: ${{ parameters.runAsPublic }}
8080
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
8181
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
82-
82+
8383
- ${{ if and(eq(parameters.graphFileGeneration.enabled, true), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
8484
- template: ../job/generate-graph-files.yml
8585
parameters:

‎eng/common/templates/post-build/darc-gather-drop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
displayName: Darc gather-drop
1818
inputs:
1919
filePath: $(Build.SourcesDirectory)/eng/common/post-build/darc-gather-drop.ps1
20-
arguments: -BarBuildId $(BARBuildId)
21-
-DropLocation $(Agent.BuildDirectory)/Temp/Drop/
20+
arguments: -BarBuildId $(BARBuildId)
21+
-DropLocation $(Agent.BuildDirectory)/Temp/Drop/
2222
-MaestroApiAccessToken $(MaestroApiAccessToken)
2323
-MaestroApiEndPoint $(MaestroApiEndPoint)
2424
-MaestroApiVersion $(MaestroApiVersion)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ stages:
4141
displayName: Validate
4242
inputs:
4343
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
44-
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
45-
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
44+
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
45+
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
4646

4747
- ${{ if eq(parameters.enableSigningValidation, 'true') }}:
4848
- job:
@@ -70,7 +70,7 @@ stages:
7070
arguments: -task SigningValidation -restore -msbuildEngine dotnet
7171
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
7272
/p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
73-
/p:Configuration=Release
73+
/p:Configuration=Release
7474
${{ parameters.signingValidationAdditionalParameters }}
7575

7676
- ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}:
@@ -92,9 +92,9 @@ stages:
9292
displayName: Validate
9393
inputs:
9494
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
95-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
96-
-ExtractPath $(Agent.BuildDirectory)/Extract/
97-
-GHRepoName $(Build.Repository.Name)
95+
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
96+
-ExtractPath $(Agent.BuildDirectory)/Extract/
97+
-GHRepoName $(Build.Repository.Name)
9898
-GHCommit $(Build.SourceVersion)
9999
-SourcelinkCliVersion $(SourceLinkCLIVersion)
100100
continueOnError: true
@@ -309,7 +309,7 @@ stages:
309309
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
310310
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
311311
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
312-
312+
313313
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
314314
parameters:
315315
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
@@ -428,4 +428,4 @@ stages:
428428
channelId: 1012
429429
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
430430
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
431-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
431+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
displayName: Add Build to Channel
2020
inputs:
2121
filePath: $(Build.SourcesDirectory)/eng/common/post-build/promote-build.ps1
22-
arguments: -BuildId $(BARBuildId)
23-
-ChannelId $(ChannelId)
22+
arguments: -BuildId $(BARBuildId)
23+
-ChannelId $(ChannelId)
2424
-MaestroApiAccessToken $(MaestroApiAccessToken)
2525
-MaestroApiEndPoint $(MaestroApiEndPoint)
2626
-MaestroApiVersion $(MaestroApiVersion)

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
},
2727
"msbuild-sdks": {
2828
"Yarn.MSBuild": "1.22.10",
29-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22505.4"
29+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22512.2"
3030
}
3131
}

0 commit comments

Comments
 (0)