From 62ecf387a3eb422cabe46c63f9474098ba3972f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 May 2025 02:02:07 +0000 Subject: [PATCH 1/2] [VMR] Codeflow e849f20-e849f20 [[ commit created by automation ]] --- eng/Common.props | 4 ++-- eng/build.ps1 | 8 ++++++++ eng/build.sh | 7 +++++++ .../src/Microsoft.AspNetCore.App.Ref.Internal.csproj | 1 + src/Http/Http.Extensions/src/RequestDelegateFactory.cs | 2 +- .../server/Core/src/Internal/HubMethodDescriptor.cs | 4 ++-- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/eng/Common.props b/eng/Common.props index fe70563343fd..f48599b4970f 100644 --- a/eng/Common.props +++ b/eng/Common.props @@ -44,8 +44,8 @@ - If we're building outside of the VMR, publish these assets from the Windows job. - If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts. --> - true $(PublishAllBuildsAssetsInThisJob) diff --git a/eng/build.ps1 b/eng/build.ps1 index 6af494960f92..854fe0679036 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -102,6 +102,9 @@ Key for feed that can be used when downloading .NET runtimes and SDKs .PARAMETER ProductBuild Build the repository in product mode (short: -pb). +.PARAMETER fromVMR +Set when building from within the VMR. + .EXAMPLE Building both native and managed projects. @@ -203,6 +206,9 @@ param( [Alias('pb')] [switch]$ProductBuild, + # Intentionally lowercase as tools.ps1 depends on it + [switch]$fromVMR, + # Capture the rest [Parameter(ValueFromRemainingArguments = $true)] [string[]]$MSBuildArguments @@ -283,6 +289,7 @@ $MSBuildArguments += "/p:TargetArchitecture=$Architecture" $MSBuildArguments += "/p:TargetOsName=win" if ($ProductBuild) { $MSBuildArguments += "/p:DotNetBuild=$ProductBuild" } +if ($fromVMR) { $MSBuildArguments += "/p:DotNetBuildFromVMR=$fromVMR" } if (-not $Configuration) { $Configuration = if ($CI) { 'Release' } else { 'Debug' } @@ -299,6 +306,7 @@ if ($RuntimeSourceFeed -or $RuntimeSourceFeedKey) { $ToolsetBuildArguments += $runtimeFeedKeyArg } if ($ProductBuild) { $ToolsetBuildArguments += "/p:DotNetBuild=$ProductBuild" } +if ($fromVMR) { $ToolsetBuildArguments += "/p:DotNetBuildFromVMR=$fromVMR" } # Split build categories between dotnet msbuild and desktop msbuild. Use desktop msbuild as little as possible. [string[]]$dotnetBuildArguments = '' diff --git a/eng/build.sh b/eng/build.sh index e18c217d4189..a3c193488e83 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -38,6 +38,7 @@ runtime_source_feed_key='' source_build='' product_build='' warn_as_error=true +from_vmr='' if [ "$(uname)" = "Darwin" ]; then target_os_name='osx' @@ -94,6 +95,7 @@ Options: --sourceBuild|-sb Build the repository in source-only mode. --productBuild|-pb Build the repository in product-build mode. + --fromVMR Set when building from within the VMR. Description: This build script installs required tools and runs an MSBuild command on this repository @@ -261,6 +263,9 @@ while [[ $# -gt 0 ]]; do -productbuild|-product-build|-pb) product_build=true ;; + -fromvmr|-from-vmr) + from_vmr=true + ;; -warnaserror) shift [ -z "${1:-}" ] && __error "Missing value for parameter --warnaserror" && __usage @@ -325,6 +330,7 @@ fi [ ! -z "$build_installers" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildInstallers=$build_installers" [ ! -z "$product_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuild=$product_build" [ ! -z "$source_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildSourceOnly=$source_build" +[ ! -z "$from_vmr" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildFromVMR=$from_vmr" # Run restore by default unless --no-restore or --no-build was specified. [ -z "$run_restore" ] && run_restore=true @@ -363,6 +369,7 @@ if [ ! -z "$runtime_source_feed$runtime_source_feed_key" ]; then fi [ ! -z "$product_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuild=$product_build" [ ! -z "$source_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildSourceOnly=$source_build" +[ ! -z "$from_vmr" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildFromVMR=$from_vmr" # Initialize global variables need to be set before the import of Arcade is imported restore=$run_restore diff --git a/src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj b/src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj index 08223b01aff3..3646532ddf9e 100644 --- a/src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj +++ b/src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj @@ -11,6 +11,7 @@ false false true + false diff --git a/src/Http/Http.Extensions/src/RequestDelegateFactory.cs b/src/Http/Http.Extensions/src/RequestDelegateFactory.cs index c0eaa1c56032..19965ef1fc31 100644 --- a/src/Http/Http.Extensions/src/RequestDelegateFactory.cs +++ b/src/Http/Http.Extensions/src/RequestDelegateFactory.cs @@ -1642,7 +1642,7 @@ private static Expression BindParameterFromService(ParameterInfo parameter, Requ return Expression.Call(GetRequiredServiceMethod.MakeGenericMethod(parameter.ParameterType), RequestServicesExpr); } - private static Expression BindParameterFromKeyedService(ParameterInfo parameter, object key, RequestDelegateFactoryContext factoryContext) + private static Expression BindParameterFromKeyedService(ParameterInfo parameter, object? key, RequestDelegateFactoryContext factoryContext) { var isOptional = IsOptionalParameter(parameter, factoryContext); diff --git a/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs b/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs index d2d064c10378..f32e5a9afc90 100644 --- a/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs +++ b/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs @@ -97,7 +97,7 @@ public HubMethodDescriptor(ObjectMethodExecutor methodExecutor, IServiceProvider { if (keyedServiceProvider.IsKeyedService(GetServiceType(p.ParameterType), keyedServicesAttribute.Key)) { - KeyedServiceKeys ??= new List<(int, object)>(); + KeyedServiceKeys ??= new List<(int, object?)>(); KeyedServiceKeys.Add((index, keyedServicesAttribute.Key)); MarkServiceParameter(index); } @@ -158,7 +158,7 @@ private bool MarkServiceParameter(int index) public List? StreamingParameters { get; private set; } - public List<(int, object)>? KeyedServiceKeys { get; private set; } + public List<(int, object?)>? KeyedServiceKeys { get; private set; } public ObjectMethodExecutor MethodExecutor { get; } From 229cf108dc0a259bfff8e73e76814e4fb3078595 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 May 2025 02:02:15 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/dotnet build 269884 Updated Dependencies: dotnet-ef, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design (Version 10.0.0-preview.4.25270.108 -> 10.0.0-preview.6.25277.102) Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, 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.Configuration, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.Diagnostics, Microsoft.Extensions.Diagnostics.Abstractions, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Composite, Microsoft.Extensions.FileProviders.Physical, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Hosting, Microsoft.Extensions.Http, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Logging, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Options, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.DirectoryServices.Protocols, System.Formats.Asn1, System.IO.Pipelines, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Reflection.Metadata, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encodings.Web, System.Text.Json, System.Threading.AccessControl, System.Threading.Channels, System.Threading.RateLimiting, Microsoft.Extensions.DependencyModel, Microsoft.NETCore.App.Ref, Microsoft.NET.Runtime.MonoAOTCompiler.Task, Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, System.Collections.Immutable, System.Diagnostics.PerformanceCounter, System.IO.Hashing, System.Memory.Data, System.Numerics.Tensors, System.Runtime.Caching, Microsoft.NETCore.App.Runtime.win-x64, Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm, Microsoft.NETCore.BrowserDebugHost.Transport, System.Composition, Microsoft.NETCore.Platforms (Version 10.0.0-preview.5.25270.108 -> 10.0.0-preview.6.25277.102) Microsoft.Web.Xdt (Version 10.0.0-preview.25270.108 -> 10.0.0-preview.25277.102) Microsoft.DotNet.HotReload.Agent, Microsoft.DotNet.HotReload.Agent.Data (Version 10.0.100-preview.5.25270.108 -> 10.0.100-preview.6.25277.102) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk (Version 10.0.0-beta.25270.108 -> 10.0.0-beta.25277.102) --- eng/Version.Details.xml | 370 ++++++++++++++++++++-------------------- eng/Versions.props | 178 +++++++++---------- global.json | 6 +- 3 files changed, 277 insertions(+), 277 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51539f8ffa0e..3cd404d38d70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,337 +8,337 @@ See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc. --> - + - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 @@ -357,52 +357,52 @@ https://github.com/dotnet/roslyn afdd413cee50c16318620252e4e64dc326e2d300 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 - + https://github.com/dotnet/dotnet - 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d + 0a01b394b186e190a80cb55740c13f6293cf5446 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index c33dd843af30..f85f72198023 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,97 +67,97 @@ --> - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 9.6.0-preview.1.25271.2 9.6.0-preview.1.25271.2 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25277.102 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 + 10.0.0-preview.6.25278.103 - 10.0.100-preview.6.25277.102 - 10.0.100-preview.6.25277.102 + 10.0.100-preview.6.25278.103 + 10.0.100-preview.6.25278.103 4.13.0-3.24613.7 @@ -170,12 +170,12 @@ 6.2.4 6.2.4 - 10.0.0-beta.25277.102 - 10.0.0-beta.25277.102 - 10.0.0-beta.25277.102 - 10.0.0-beta.25277.102 + 10.0.0-beta.25278.103 + 10.0.0-beta.25278.103 + 10.0.0-beta.25278.103 + 10.0.0-beta.25278.103 - 10.0.0-preview.25277.102 + 10.0.0-preview.25278.103 1.0.0-prerelease.25217.3 1.0.0-prerelease.25217.3 diff --git a/global.json b/global.json index 315dcb58e2cb..0e33e0235134 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25277.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25277.102", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25277.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25278.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25278.103", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25278.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" }