Skip to content

Commit a7a2800

Browse files
[release/5.0] Update dependencies from dotnet/arcade dotnet/runtime dotnet/efcore (#25469)
[release/5.0] Update dependencies from dotnet/arcade dotnet/runtime dotnet/efcore - Updates: - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20431.9 - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20431.9 - dotnet-ef: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20431.9 - Microsoft.EntityFrameworkCore: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20431.9 - Microsoft.EntityFrameworkCore.Design: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20431.9 - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20431.9 - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20431.9 - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20431.9 - Updates: - System.ComponentModel.Annotations: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Diagnostics.DiagnosticSource: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Diagnostics.EventLog: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.DirectoryServices.Protocols: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Logging.Abstractions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Logging.Configuration: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Logging.Console: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Logging.Debug: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Logging.EventLog: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Logging.EventSource: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Logging.TraceSource: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Options: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Options.ConfigurationExtensions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Options.DataAnnotations: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Primitives: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Logging: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Internal.Transport: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Http: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Hosting.Abstractions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Caching.Abstractions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Caching.Memory: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Configuration: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Configuration.Abstractions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Configuration.Binder: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Configuration.CommandLine: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Configuration.EnvironmentVariables: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Configuration.FileExtensions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Configuration.Ini: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Configuration.UserSecrets: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Configuration.Xml: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.DependencyInjection: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.DependencyInjection.Abstractions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.FileProviders.Abstractions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.FileProviders.Composite: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.FileProviders.Physical: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.FileSystemGlobbing: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.HostFactoryResolver.Sources: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Hosting: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.Configuration.Json: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.BrowserDebugHost.Transport: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Win32.Registry: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.Win32.SystemEvents: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Drawing.Common: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Text.Json: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Threading.Channels: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Windows.Extensions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Text.Encodings.Web: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.ServiceProcess.ServiceController: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.IO.Pipelines: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Net.Http.Json: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Net.Http.WinHttpHandler: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Net.WebSockets.WebSocketProtocol: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Reflection.Metadata: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Resources.Extensions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Runtime.CompilerServices.Unsafe: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Security.AccessControl: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Security.Cryptography.Cng: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Security.Cryptography.Pkcs: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Security.Cryptography.Xml: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Security.Permissions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - System.Security.Principal.Windows: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.14 - Updates: - Microsoft.DotNet.Build.Tasks.Installers: from 5.0.0-beta.20427.5 to 5.0.0-beta.20431.1 - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20427.5 to 5.0.0-beta.20431.1 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20427.5 to 5.0.0-beta.20431.1 - Merge branch 'release/5.0' into darc-release/5.0-46fc5024-d7ad-477c-9089-31f91f2fb7a6
1 parent 7579b30 commit a7a2800

File tree

11 files changed

+2232
-298
lines changed

11 files changed

+2232
-298
lines changed

eng/Version.Details.xml

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

eng/Versions.props

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

eng/common/build.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10+
[bool] $useDefaultDotnetInstall = $false,
1011
[switch][Alias('r')]$restore,
1112
[switch] $deployDeps,
1213
[switch][Alias('b')]$build,
@@ -65,6 +66,7 @@ function Print-Usage() {
6566
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6667
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6768
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
69+
Write-Host " -useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
6870
Write-Host ""
6971

7072
Write-Host "Command line arguments not listed above are passed thru to msbuild."

eng/common/build.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ usage()
3636
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
3737
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
3838
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
39+
echo " --useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
40+
3941
echo ""
4042
echo "Command line arguments not listed above are passed thru to msbuild."
4143
echo "Arguments can also be passed in with a single hyphen."
@@ -78,6 +80,7 @@ prepare_machine=false
7880
verbosity='minimal'
7981
runtime_source_feed=''
8082
runtime_source_feed_key=''
83+
use_default_dotnet_install=false
8184

8285
properties=''
8386
while [[ $# > 0 ]]; do
@@ -156,10 +159,14 @@ while [[ $# > 0 ]]; do
156159
runtime_source_feed=$2
157160
shift
158161
;;
159-
-runtimesourcefeedkey)
162+
-runtimesourcefeedkey)
160163
runtime_source_feed_key=$2
161164
shift
162165
;;
166+
-usedefaultdotnetinstall)
167+
use_default_dotnet_install=$2
168+
shift
169+
;;
163170
*)
164171
properties="$properties $1"
165172
;;

0 commit comments

Comments
 (0)