Skip to content

Commit 7620fe2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/5.0] Update dependencies from dotnet/arcade dotnet/runtime dotnet/efcore (dotnet#25100)
* Update dependencies from https://github.com/dotnet/arcade build 20200819.21 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20417.6 -> To Version 5.0.0-beta.20419.21 * Update dependencies from https://github.com/dotnet/runtime build 20200821.18 System.ComponentModel.Annotations , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting.Abstractions , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Ref , System.Drawing.Common , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.Security.Principal.Windows , System.Security.Cryptography.Xml , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Permissions From Version 5.0.0-rc.1.20416.7 -> To Version 5.0.0-rc.1.20421.18 * Update dependencies from https://github.com/dotnet/efcore build 20200822.1 Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory From Version 5.0.0-rc.1.20420.2 -> To Version 5.0.0-rc.1.20422.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 85835c7 commit 7620fe2

9 files changed

+487
-420
lines changed

‎eng/Version.Details.xml

Lines changed: 148 additions & 148 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 72 additions & 72 deletions
Large diffs are not rendered by default.

‎eng/common/performance/performance-setup.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,15 @@ if [[ "$mono_dotnet" != "" ]]; then
199199
fi
200200

201201
if [[ "$wasm_runtime_loc" != "" ]]; then
202-
configurations="CompilationMode=wasm;RunKind=micro"
202+
configurations="CompilationMode=wasm RunKind=micro"
203+
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoWASM"
203204
fi
204205

205206
if [[ "$monointerpreter" == "true" ]]; then
206207
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter"
207208
fi
208209

209-
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs \"$configurations\" --architecture $architecture"
210+
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
210211
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
211212

212213

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
param(
22
[Parameter(Mandatory=$true)][int] $BuildId,
3+
[Parameter(Mandatory=$true)][int] $PublishingInfraVersion,
34
[Parameter(Mandatory=$true)][string] $AzdoToken,
45
[Parameter(Mandatory=$true)][string] $MaestroToken,
56
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
67
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
7-
[Parameter(Mandatory=$true)][string] $EnableSourceLinkValidation,
8-
[Parameter(Mandatory=$true)][string] $EnableSigningValidation,
9-
[Parameter(Mandatory=$true)][string] $EnableNugetValidation,
8+
[Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
9+
[Parameter(Mandatory=$false)][string] $EnableSigningValidation,
10+
[Parameter(Mandatory=$false)][string] $EnableNugetValidation,
1011
[Parameter(Mandatory=$true)][string] $PublishInstallersAndChecksums,
1112
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
1213
[Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
1314
)
1415

1516
try {
1617
. $PSScriptRoot\post-build-utils.ps1
17-
. $PSScriptRoot\..\darc-init.ps1
18+
# Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel
19+
. $PSScriptRoot\..\darc-init.ps1 -darcVersion "1.1.0-beta.20418.1"
1820

1921
$optionalParams = [System.Collections.ArrayList]::new()
2022

@@ -49,12 +51,13 @@ try {
4951
}
5052

5153
& darc add-build-to-channel `
52-
--id $buildId `
53-
--default-channels `
54-
--source-branch master `
55-
--azdev-pat $AzdoToken `
56-
--bar-uri $MaestroApiEndPoint `
57-
--password $MaestroToken `
54+
--id $buildId `
55+
--publishing-infra-version $PublishingInfraVersion `
56+
--default-channels `
57+
--source-branch master `
58+
--azdev-pat $AzdoToken `
59+
--bar-uri $MaestroApiEndPoint `
60+
--password $MaestroToken `
5861
@optionalParams
5962

6063
if ($LastExitCode -ne 0) {

‎eng/common/templates/post-build/channels/generic-internal-channel.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
parameters:
2+
BARBuildId: ''
3+
PromoteToChannelIds: ''
24
artifactsPublishingAdditionalParameters: ''
35
dependsOn:
46
- Validate
@@ -19,6 +21,9 @@ stages:
1921
displayName: ${{ parameters.channelName }} Publishing
2022
jobs:
2123
- template: ../setup-maestro-vars.yml
24+
parameters:
25+
BARBuildId: ${{ parameters.BARBuildId }}
26+
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
2227

2328
- job: publish_symbols
2429
displayName: Symbol Publishing
@@ -138,6 +143,7 @@ stages:
138143
inputs:
139144
filePath: eng\common\sdk-task.ps1
140145
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
146+
/p:PublishingInfraVersion=2
141147
/p:IsStableBuild=$(IsStableBuild)
142148
/p:IsInternalBuild=$(IsInternalBuild)
143149
/p:RepositoryName=$(Build.Repository.Name)

‎eng/common/templates/post-build/channels/generic-public-channel.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
parameters:
2+
BARBuildId: ''
3+
PromoteToChannelIds: ''
24
artifactsPublishingAdditionalParameters: ''
35
dependsOn:
46
- Validate
@@ -21,6 +23,9 @@ stages:
2123
displayName: ${{ parameters.channelName }} Publishing
2224
jobs:
2325
- template: ../setup-maestro-vars.yml
26+
parameters:
27+
BARBuildId: ${{ parameters.BARBuildId }}
28+
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
2429

2530
- job: publish_symbols
2631
displayName: Symbol Publishing
@@ -137,6 +142,7 @@ stages:
137142
inputs:
138143
filePath: eng\common\sdk-task.ps1
139144
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
145+
/p:PublishingInfraVersion=2
140146
/p:ArtifactsCategory=$(ArtifactsCategory)
141147
/p:IsStableBuild=$(IsStableBuild)
142148
/p:IsInternalBuild=$(IsInternalBuild)

0 commit comments

Comments
 (0)