From 7c4657d8eb4ece65e57374ead2a2524c842c716f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 May 2025 02:02:27 +0000 Subject: [PATCH 1/6] [VMR] Codeflow 7ba32e7-7ba32e7 [[ commit created by automation ]] --- eng/Build.props | 8 ++++---- eng/Common.props | 6 +++--- eng/Dependencies.props | 19 +++++++++++++++++++ eng/Publishing.props | 11 +++++------ eng/SharedFramework.External.props | 1 + eng/build.ps1 | 12 ++++++++++-- eng/build.sh | 11 +++++++++-- eng/configure-toolset.sh | 2 +- .../GenerateFiles/Directory.Build.targets.in | 4 ++-- ...crosoft.AspNetCore.App.Ref.Internal.csproj | 1 + .../src/RequestDelegateFactory.cs | 2 +- .../Microsoft.AspNetCore.Server.IIS.csproj | 2 +- .../Core/src/Internal/HubMethodDescriptor.cs | 4 ++-- 13 files changed, 59 insertions(+), 24 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index dbaf0c170561..82b60be223a2 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -56,14 +56,14 @@ $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj; " /> - + - + - + @@ -264,7 +264,7 @@ <_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64'">ARM64 - + diff --git a/eng/Common.props b/eng/Common.props index 6c75a0f82850..f48599b4970f 100644 --- a/eng/Common.props +++ b/eng/Common.props @@ -11,7 +11,7 @@ $(TargetOsName)-$(TargetArchitecture) true - $(TargetRuntimeIdentifier) + $(TargetRuntimeIdentifier) $(BuildNodeJSUnlessSourcebuild) false @@ -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/Dependencies.props b/eng/Dependencies.props index cc03487fc95b..81c068cca69f 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -258,4 +258,23 @@ and are generated based on the last package release. Condition=" $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime.')) or $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Crossgen2.'))">$(MicrosoftNETCoreAppRefVersion) + + + + + $(MicrosoftCodeAnalysisVersion_LatestVS) + + + $(Analyzer_MicrosoftCodeAnalysisCSharpVersion) + + + $(Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion) + + + $(MicrosoftCodeAnalysisVersion_LatestVS) + + + $(MicrosoftCodeAnalysisVersion_LatestVS) + + diff --git a/eng/Publishing.props b/eng/Publishing.props index 0fe48f75295b..f53bb87814a6 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -1,15 +1,14 @@ + true - + false + '$(DotNetBuild)' != 'true'">false false diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props index 8b5b19fb9861..9096f00ebe40 100644 --- a/eng/SharedFramework.External.props +++ b/eng/SharedFramework.External.props @@ -43,6 +43,7 @@ + - + ${MicrosoftNETCoreAppRefVersion} @@ -84,7 +84,7 @@ %(RuntimePackRuntimeIdentifiers);$(TargetRuntimeIdentifier) - + ${MicrosoftNETCoreAppRefVersion} 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/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj index ef46ff81213d..a456190bc234 100644 --- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj @@ -45,7 +45,7 @@ - + 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 c839119bef75e8718cab2e147e92483a42f78359 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 May 2025 02:02:35 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/dotnet build 269352 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.25265.101 -> 10.0.0-preview.4.25270.108) 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.25265.101 -> 10.0.0-preview.5.25270.108) Microsoft.Web.Xdt (Version 10.0.0-preview.25265.101 -> 10.0.0-preview.25270.108) Microsoft.DotNet.HotReload.Agent, Microsoft.DotNet.HotReload.Agent.Data (Version 10.0.100-preview.5.25265.101 -> 10.0.100-preview.5.25270.108) 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.25265.101 -> 10.0.0-beta.25270.108) --- eng/Version.Details.xml | 370 +++++++++--------- eng/Versions.props | 178 ++++----- eng/common/build.ps1 | 5 +- eng/common/build.sh | 20 +- .../core-templates/post-build/post-build.yml | 3 - .../steps/install-microbuild.yml | 35 -- eng/common/templates/steps/vmr-sync.yml | 207 ++++++++++ eng/common/templates/vmr-build-pr.yml | 33 ++ eng/common/tools.ps1 | 8 +- eng/common/tools.sh | 8 +- eng/common/vmr-sync.ps1 | 138 +++++++ eng/common/vmr-sync.sh | 205 ++++++++++ global.json | 10 +- 13 files changed, 887 insertions(+), 333 deletions(-) create mode 100644 eng/common/templates/steps/vmr-sync.yml create mode 100644 eng/common/templates/vmr-build-pr.yml create mode 100755 eng/common/vmr-sync.ps1 create mode 100755 eng/common/vmr-sync.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae10ab52298c..7693beb4cffe 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 - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c @@ -357,52 +357,52 @@ https://github.com/dotnet/roslyn afdd413cee50c16318620252e4e64dc326e2d300 - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index d0b63dadd600..4cc3134c0461 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,97 +67,97 @@ --> - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.5.25265.101 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 9.6.0-preview.1.25260.2 9.6.0-preview.1.25260.2 - 10.0.0-preview.4.25265.101 - 10.0.0-preview.4.25265.101 - 10.0.0-preview.4.25265.101 - 10.0.0-preview.4.25265.101 - 10.0.0-preview.4.25265.101 - 10.0.0-preview.4.25265.101 - 10.0.0-preview.4.25265.101 - 10.0.0-preview.4.25265.101 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25272.109 - 10.0.100-preview.5.25265.101 - 10.0.100-preview.5.25265.101 + 10.0.100-preview.6.25272.109 + 10.0.100-preview.6.25272.109 4.13.0-3.24613.7 @@ -170,12 +170,12 @@ 6.2.4 6.2.4 - 10.0.0-beta.25265.101 - 10.0.0-beta.25265.101 - 10.0.0-beta.25265.101 - 10.0.0-beta.25265.101 + 10.0.0-beta.25272.109 + 10.0.0-beta.25272.109 + 10.0.0-beta.25272.109 + 10.0.0-beta.25272.109 - 10.0.0-preview.25265.101 + 10.0.0-preview.25272.109 1.0.0-prerelease.25217.3 1.0.0-prerelease.25217.3 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 6b3be1916fca..8cfee107e7a3 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -21,6 +21,7 @@ Param( [switch] $publish, [switch] $clean, [switch][Alias('pb')]$productBuild, + [switch]$fromVMR, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, [switch] $ci, @@ -74,6 +75,7 @@ function Print-Usage() { Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host " -nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" Write-Host " -buildCheck Sets /check msbuild parameter" + Write-Host " -fromVMR Set when building from within the VMR" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -127,7 +129,8 @@ function Build { /p:Deploy=$deploy ` /p:Test=$test ` /p:Pack=$pack ` - /p:DotNetBuildRepo=$productBuild ` + /p:DotNetBuild=$productBuild ` + /p:DotNetBuildFromVMR=$fromVMR ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index 27ae2c85601f..b105db583c40 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -43,6 +43,7 @@ usage() echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" echo " --buildCheck Sets /check msbuild parameter" + echo " --fromVMR Set when building from within the VMR" echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -64,6 +65,7 @@ restore=false build=false source_build=false product_build=false +from_vmr=false rebuild=false test=false integration_test=false @@ -89,7 +91,7 @@ verbosity='minimal' runtime_source_feed='' runtime_source_feed_key='' -properties='' +properties=() while [[ $# > 0 ]]; do opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" case "$opt" in @@ -129,19 +131,22 @@ while [[ $# > 0 ]]; do -pack) pack=true ;; - -sourcebuild|-sb) + -sourcebuild|-source-build|-sb) build=true source_build=true product_build=true restore=true pack=true ;; - -productbuild|-pb) + -productbuild|-product-build|-pb) build=true product_build=true restore=true pack=true ;; + -fromvmr|-from-vmr) + from_vmr=true + ;; -test|-t) test=true ;; @@ -187,7 +192,7 @@ while [[ $# > 0 ]]; do shift ;; *) - properties="$properties $1" + properties+=("$1") ;; esac @@ -221,7 +226,7 @@ function Build { InitializeCustomToolset if [[ ! -z "$projects" ]]; then - properties="$properties /p:Projects=$projects" + properties+=("/p:Projects=$projects") fi local bl="" @@ -241,8 +246,9 @@ function Build { /p:RepoRoot="$repo_root" \ /p:Restore=$restore \ /p:Build=$build \ - /p:DotNetBuildRepo=$product_build \ + /p:DotNetBuild=$product_build \ /p:DotNetBuildSourceOnly=$source_build \ + /p:DotNetBuildFromVMR=$from_vmr \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ @@ -251,7 +257,7 @@ function Build { /p:Sign=$sign \ /p:Publish=$publish \ /p:RestoreStaticGraphEnableBinaryLogger=$binary_log \ - $properties + "${properties[@]}" ExitWithExitCode 0 } diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 5757915edb3e..a151fd811e3e 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -193,9 +193,6 @@ stages: buildId: $(AzDOBuildId) artifactName: PackageArtifacts checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 2bcf974ee153..a3540ba00c7e 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -48,38 +48,3 @@ steps: eq(variables['_SignType'], 'real') ) )) - - # Workaround for ESRP CLI on Linux - https://github.com/dotnet/source-build/issues/4964 - - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - - task: UseDotNet@2 - displayName: Install .NET 9.0 SDK for ESRP CLI Workaround - inputs: - packageType: sdk - version: 9.0.x - installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet - workingDirectory: ${{ parameters.microBuildOutputFolder }} - condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) - - - task: PowerShell@2 - displayName: Workaround for ESRP CLI on Linux - inputs: - targetType: 'inline' - script: | - Write-Host "Copying Linux Path" - $MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)' - $MBSIGN_APPFOLDER = ($MBSIGN_APPFOLDER -replace '/build', '') - - $versionRegex = '\d+\.\d+\.\d+' - $package = Get-ChildItem -Path $MBSIGN_APPFOLDER -Directory | - Where-Object { $_.Name -match $versionRegex } - - if ($package.Count -ne 1) { - Write-Host "There should be exactly one matching subfolder, but found $($package.Count)." - exit 1 - } - - $MBSIGN_APPFOLDER = $package[0].FullName + '/build' - $MBSIGN_APPFOLDER | Write-Host - $SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml' - Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force - condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) diff --git a/eng/common/templates/steps/vmr-sync.yml b/eng/common/templates/steps/vmr-sync.yml new file mode 100644 index 000000000000..599afb6186b8 --- /dev/null +++ b/eng/common/templates/steps/vmr-sync.yml @@ -0,0 +1,207 @@ +### These steps synchronize new code from product repositories into the VMR (https://github.com/dotnet/dotnet). +### They initialize the darc CLI and pull the new updates. +### Changes are applied locally onto the already cloned VMR (located in $vmrPath). + +parameters: +- name: targetRef + displayName: Target revision in dotnet/ to synchronize + type: string + default: $(Build.SourceVersion) + +- name: vmrPath + displayName: Path where the dotnet/dotnet is checked out to + type: string + default: $(Agent.BuildDirectory)/vmr + +- name: additionalSyncs + displayName: Optional list of package names whose repo's source will also be synchronized in the local VMR, e.g. NuGet.Protocol + type: object + default: [] + +steps: +- checkout: vmr + displayName: Clone dotnet/dotnet + path: vmr + clean: true + +- checkout: self + displayName: Clone $(Build.Repository.Name) + path: repo + fetchDepth: 0 + +# This step is needed so that when we get a detached HEAD / shallow clone, +# we still pull the commit into the temporary repo clone to use it during the sync. +# Also unshallow the clone so that forwardflow command would work. +- script: | + git branch repo-head + git rev-parse HEAD + displayName: Label PR commit + workingDirectory: $(Agent.BuildDirectory)/repo + +- script: | + vmr_sha=$(grep -oP '(?<=Sha=")[^"]*' $(Agent.BuildDirectory)/repo/eng/Version.Details.xml) + echo "##vso[task.setvariable variable=vmr_sha]$vmr_sha" + displayName: Obtain the vmr sha from Version.Details.xml (Unix) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- powershell: | + [xml]$xml = Get-Content -Path $(Agent.BuildDirectory)/repo/eng/Version.Details.xml + $vmr_sha = $xml.SelectSingleNode("//Source").Sha + Write-Output "##vso[task.setvariable variable=vmr_sha]$vmr_sha" + displayName: Obtain the vmr sha from Version.Details.xml (Windows) + condition: eq(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- script: | + git fetch --all + git checkout $(vmr_sha) + displayName: Checkout VMR at correct sha for repo flow + workingDirectory: ${{ parameters.vmrPath }} + +- script: | + git config --global user.name "dotnet-maestro[bot]" + git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com" + displayName: Set git author to dotnet-maestro[bot] + workingDirectory: ${{ parameters.vmrPath }} + +- script: | + ./eng/common/vmr-sync.sh \ + --vmr ${{ parameters.vmrPath }} \ + --tmp $(Agent.TempDirectory) \ + --azdev-pat '$(dn-bot-all-orgs-code-r)' \ + --ci \ + --debug + + if [ "$?" -ne 0 ]; then + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + fi + displayName: Sync repo into VMR (Unix) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- script: | + git config --global diff.astextplain.textconv echo + git config --system core.longpaths true + displayName: Configure Windows git (longpaths, astextplain) + condition: eq(variables['Agent.OS'], 'Windows_NT') + +- powershell: | + ./eng/common/vmr-sync.ps1 ` + -vmr ${{ parameters.vmrPath }} ` + -tmp $(Agent.TempDirectory) ` + -azdevPat '$(dn-bot-all-orgs-code-r)' ` + -ci ` + -debugOutput + + if ($LASTEXITCODE -ne 0) { + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + } + displayName: Sync repo into VMR (Windows) + condition: eq(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - task: CopyFiles@2 + displayName: Collect failed patches + condition: failed() + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: '*.patch' + TargetFolder: '$(Build.ArtifactStagingDirectory)/FailedPatches' + + - publish: '$(Build.ArtifactStagingDirectory)/FailedPatches' + artifact: $(System.JobDisplayName)_FailedPatches + displayName: Upload failed patches + condition: failed() + +- ${{ each assetName in parameters.additionalSyncs }}: + # The vmr-sync script ends up staging files in the local VMR so we have to commit those + - script: + git commit --allow-empty -am "Forward-flow $(Build.Repository.Name)" + displayName: Commit local VMR changes + workingDirectory: ${{ parameters.vmrPath }} + + - script: | + set -ex + + echo "Searching for details of asset ${{ assetName }}..." + + # Use darc to get dependencies information + dependencies=$(./.dotnet/dotnet darc get-dependencies --name '${{ assetName }}' --ci) + + # Extract repository URL and commit hash + repository=$(echo "$dependencies" | grep 'Repo:' | sed 's/Repo:[[:space:]]*//' | head -1) + + if [ -z "$repository" ]; then + echo "##vso[task.logissue type=error]Asset ${{ assetName }} not found in the dependency list" + exit 1 + fi + + commit=$(echo "$dependencies" | grep 'Commit:' | sed 's/Commit:[[:space:]]*//' | head -1) + + echo "Updating the VMR from $repository / $commit..." + cd .. + git clone $repository ${{ assetName }} + cd ${{ assetName }} + git checkout $commit + git branch "sync/$commit" + + ./eng/common/vmr-sync.sh \ + --vmr ${{ parameters.vmrPath }} \ + --tmp $(Agent.TempDirectory) \ + --azdev-pat '$(dn-bot-all-orgs-code-r)' \ + --ci \ + --debug + + if [ "$?" -ne 0 ]; then + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + fi + displayName: Sync ${{ assetName }} into (Unix) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + + - powershell: | + $ErrorActionPreference = 'Stop' + + Write-Host "Searching for details of asset ${{ assetName }}..." + + $dependencies = .\.dotnet\dotnet darc get-dependencies --name '${{ assetName }}' --ci + + $repository = $dependencies | Select-String -Pattern 'Repo:\s+([^\s]+)' | Select-Object -First 1 + $repository -match 'Repo:\s+([^\s]+)' | Out-Null + $repository = $matches[1] + + if ($repository -eq $null) { + Write-Error "Asset ${{ assetName }} not found in the dependency list" + exit 1 + } + + $commit = $dependencies | Select-String -Pattern 'Commit:\s+([^\s]+)' | Select-Object -First 1 + $commit -match 'Commit:\s+([^\s]+)' | Out-Null + $commit = $matches[1] + + Write-Host "Updating the VMR from $repository / $commit..." + cd .. + git clone $repository ${{ assetName }} + cd ${{ assetName }} + git checkout $commit + git branch "sync/$commit" + + .\eng\common\vmr-sync.ps1 ` + -vmr ${{ parameters.vmrPath }} ` + -tmp $(Agent.TempDirectory) ` + -azdevPat '$(dn-bot-all-orgs-code-r)' ` + -ci ` + -debugOutput + + if ($LASTEXITCODE -ne 0) { + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + } + displayName: Sync ${{ assetName }} into (Windows) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml new file mode 100644 index 000000000000..670cf32c3bd1 --- /dev/null +++ b/eng/common/templates/vmr-build-pr.yml @@ -0,0 +1,33 @@ +trigger: none +pr: + branches: + include: + - main + - release/* + paths: + exclude: + - documentation/* + - README.md + - CODEOWNERS + +variables: +- template: /eng/common/templates/variables/pool-providers.yml@self + +- name: skipComponentGovernanceDetection # we run CG on internal builds only + value: true + +- name: Codeql.Enabled # we run CodeQL on internal builds only + value: false + +resources: + repositories: + - repository: vmr + type: github + name: dotnet/dotnet + endpoint: dotnet + +stages: +- template: /eng/pipelines/templates/stages/vmr-build.yml@vmr + parameters: + isBuiltFromVmr: false + scope: lite diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5f40a3f8238a..046ec9d08a0f 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -65,8 +65,8 @@ $ErrorActionPreference = 'Stop' # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } -# True if the build is a product build -[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } +# True when the build is running within the VMR. +[bool]$fromVMR = if (Test-Path variable:fromVMR) { $fromVMR } else { $false } function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null @@ -850,8 +850,8 @@ function MSBuild-Core() { } # When running on Azure Pipelines, override the returned exit code to avoid double logging. - # Skip this when the build is a child of the VMR orchestrator build. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) { + # Skip this when the build is a child of the VMR build. + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 25f5932eee98..8bc68e8460f0 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -72,8 +72,8 @@ fi runtime_source_feed=${runtime_source_feed:-''} runtime_source_feed_key=${runtime_source_feed_key:-''} -# True if the build is a product build -product_build=${product_build:-false} +# True when the build is running within the VMR. +from_vmr=${from_vmr:-false} # Resolve any symlinks in the given path. function ResolvePath { @@ -506,8 +506,8 @@ function MSBuild-Core { echo "Build failed with exit code $exit_code. Check errors above." # When running on Azure Pipelines, override the returned exit code to avoid double logging. - # Skip this when the build is a child of the VMR orchestrator build. - if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then + # Skip this when the build is a child of the VMR build. + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/eng/common/vmr-sync.ps1 b/eng/common/vmr-sync.ps1 new file mode 100755 index 000000000000..8c3c91ce8ded --- /dev/null +++ b/eng/common/vmr-sync.ps1 @@ -0,0 +1,138 @@ +<# +.SYNOPSIS + +This script is used for synchronizing the current repository into a local VMR. +It pulls the current repository's code into the specified VMR directory for local testing or +Source-Build validation. + +.DESCRIPTION + +The tooling used for synchronization will clone the VMR repository into a temporary folder if +it does not already exist. These clones can be reused in future synchronizations, so it is +recommended to dedicate a folder for this to speed up re-runs. + +.EXAMPLE + Synchronize current repository into a local VMR: + ./vmr-sync.ps1 -vmrDir "$HOME/repos/dotnet" -tmpDir "$HOME/repos/tmp" + +.PARAMETER tmpDir +Required. Path to the temporary folder where repositories will be cloned + +.PARAMETER vmrBranch +Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch + +.PARAMETER azdevPat +Optional. Azure DevOps PAT to use for cloning private repositories. + +.PARAMETER vmrDir +Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder + +.PARAMETER debugOutput +Optional. Enables debug logging in the darc vmr command. + +.PARAMETER ci +Optional. Denotes that the script is running in a CI environment. +#> +param ( + [Parameter(Mandatory=$true, HelpMessage="Path to the temporary folder where repositories will be cloned")] + [string][Alias('t', 'tmp')]$tmpDir, + [string][Alias('b', 'branch')]$vmrBranch, + [string]$remote, + [string]$azdevPat, + [string][Alias('v', 'vmr')]$vmrDir, + [switch]$ci, + [switch]$debugOutput +) + +function Fail { + Write-Host "> $($args[0])" -ForegroundColor 'Red' +} + +function Highlight { + Write-Host "> $($args[0])" -ForegroundColor 'Cyan' +} + +$verbosity = 'verbose' +if ($debugOutput) { + $verbosity = 'debug' +} +# Validation + +if (-not $tmpDir) { + Fail "Missing -tmpDir argument. Please specify the path to the temporary folder where the repositories will be cloned" + exit 1 +} + +# Sanitize the input + +if (-not $vmrDir) { + $vmrDir = Join-Path $tmpDir 'dotnet' +} + +if (-not (Test-Path -Path $tmpDir -PathType Container)) { + New-Item -ItemType Directory -Path $tmpDir | Out-Null +} + +# Prepare the VMR + +if (-not (Test-Path -Path $vmrDir -PathType Container)) { + Highlight "Cloning 'dotnet/dotnet' into $vmrDir.." + git clone https://github.com/dotnet/dotnet $vmrDir + + if ($vmrBranch) { + git -C $vmrDir switch -c $vmrBranch + } +} +else { + if ((git -C $vmrDir diff --quiet) -eq $false) { + Fail "There are changes in the working tree of $vmrDir. Please commit or stash your changes" + exit 1 + } + + if ($vmrBranch) { + Highlight "Preparing $vmrDir" + git -C $vmrDir checkout $vmrBranch + git -C $vmrDir pull + } +} + +Set-StrictMode -Version Latest + +# Prepare darc + +Highlight 'Installing .NET, preparing the tooling..' +. .\eng\common\tools.ps1 +$dotnetRoot = InitializeDotNetCli -install:$true +$dotnet = "$dotnetRoot\dotnet.exe" +& "$dotnet" tool restore + +Highlight "Starting the synchronization of VMR.." + +# Synchronize the VMR +$darcArgs = ( + "darc", "vmr", "forwardflow", + "--tmp", $tmpDir, + "--$verbosity", + $vmrDir +) + +if ($ci) { + $darcArgs += ("--ci") +} + +if ($azdevPat) { + $darcArgs += ("--azdev-pat", $azdevPat) +} + +& "$dotnet" $darcArgs + +if ($LASTEXITCODE -eq 0) { + Highlight "Synchronization succeeded" +} +else { + Fail "Synchronization of repo to VMR failed!" + Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)." + Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)." + Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." + exit 1 +} diff --git a/eng/common/vmr-sync.sh b/eng/common/vmr-sync.sh new file mode 100755 index 000000000000..86d77ccf5b48 --- /dev/null +++ b/eng/common/vmr-sync.sh @@ -0,0 +1,205 @@ +#!/bin/bash + +### This script is used for synchronizing the current repository into a local VMR. +### It pulls the current repository's code into the specified VMR directory for local testing or +### Source-Build validation. +### +### The tooling used for synchronization will clone the VMR repository into a temporary folder if +### it does not already exist. These clones can be reused in future synchronizations, so it is +### recommended to dedicate a folder for this to speed up re-runs. +### +### USAGE: +### Synchronize current repository into a local VMR: +### ./vmr-sync.sh --tmp "$HOME/repos/tmp" "$HOME/repos/dotnet" +### +### Options: +### -t, --tmp, --tmp-dir PATH +### Required. Path to the temporary folder where repositories will be cloned +### +### -b, --branch, --vmr-branch BRANCH_NAME +### Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch +### +### --debug +### Optional. Turns on the most verbose logging for the VMR tooling +### +### --remote name:URI +### Optional. Additional remote to use during the synchronization +### This can be used to synchronize to a commit from a fork of the repository +### Example: 'runtime:https://github.com/yourfork/runtime' +### +### --azdev-pat +### Optional. Azure DevOps PAT to use for cloning private repositories. +### +### -v, --vmr, --vmr-dir PATH +### Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +function print_help () { + sed -n '/^### /,/^$/p' "$source" | cut -b 5- +} + +COLOR_RED=$(tput setaf 1 2>/dev/null || true) +COLOR_CYAN=$(tput setaf 6 2>/dev/null || true) +COLOR_CLEAR=$(tput sgr0 2>/dev/null || true) +COLOR_RESET=uniquesearchablestring +FAILURE_PREFIX='> ' + +function fail () { + echo "${COLOR_RED}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_RED}}${COLOR_CLEAR}" >&2 +} + +function highlight () { + echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" +} + +tmp_dir='' +vmr_dir='' +vmr_branch='' +additional_remotes='' +verbosity=verbose +azdev_pat='' +ci=false + +while [[ $# -gt 0 ]]; do + opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + -t|--tmp|--tmp-dir) + tmp_dir=$2 + shift + ;; + -v|--vmr|--vmr-dir) + vmr_dir=$2 + shift + ;; + -b|--branch|--vmr-branch) + vmr_branch=$2 + shift + ;; + --remote) + additional_remotes="$additional_remotes $2" + shift + ;; + --azdev-pat) + azdev_pat=$2 + shift + ;; + --ci) + ci=true + ;; + -d|--debug) + verbosity=debug + ;; + -h|--help) + print_help + exit 0 + ;; + *) + fail "Invalid argument: $1" + print_help + exit 1 + ;; + esac + + shift +done + +# Validation + +if [[ -z "$tmp_dir" ]]; then + fail "Missing --tmp-dir argument. Please specify the path to the temporary folder where the repositories will be cloned" + exit 1 +fi + +# Sanitize the input + +if [[ -z "$vmr_dir" ]]; then + vmr_dir="$tmp_dir/dotnet" +fi + +if [[ ! -d "$tmp_dir" ]]; then + mkdir -p "$tmp_dir" +fi + +if [[ "$verbosity" == "debug" ]]; then + set -x +fi + +# Prepare the VMR + +if [[ ! -d "$vmr_dir" ]]; then + highlight "Cloning 'dotnet/dotnet' into $vmr_dir.." + git clone https://github.com/dotnet/dotnet "$vmr_dir" + + if [[ -n "$vmr_branch" ]]; then + git -C "$vmr_dir" switch -c "$vmr_branch" + fi +else + if ! git -C "$vmr_dir" diff --quiet; then + fail "There are changes in the working tree of $vmr_dir. Please commit or stash your changes" + exit 1 + fi + + if [[ -n "$vmr_branch" ]]; then + highlight "Preparing $vmr_dir" + git -C "$vmr_dir" checkout "$vmr_branch" + git -C "$vmr_dir" pull + fi +fi + +set -e + +# Prepare darc + +highlight 'Installing .NET, preparing the tooling..' +source "./eng/common/tools.sh" +InitializeDotNetCli true +dotnetDir=$( cd ./.dotnet/; pwd -P ) +dotnet=$dotnetDir/dotnet +"$dotnet" tool restore + +highlight "Starting the synchronization of VMR.." +set +e + +if [[ -n "$additional_remotes" ]]; then + additional_remotes="--additional-remotes $additional_remotes" +fi + +if [[ -n "$azdev_pat" ]]; then + azdev_pat="--azdev-pat $azdev_pat" +fi + +ci_arg='' +if [[ "$ci" == "true" ]]; then + ci_arg="--ci" +fi + +# Synchronize the VMR + +"$dotnet" darc vmr forwardflow \ + --tmp "$tmp_dir" \ + $azdev_pat \ + --$verbosity \ + $ci_arg \ + $additional_remotes \ + "$vmr_dir" + +if [[ $? == 0 ]]; then + highlight "Synchronization succeeded" +else + fail "Synchronization of repo to VMR failed!" + fail "'$vmr_dir' is left in its last state (re-run of this script will reset it)." + fail "Please inspect the logs which contain path to the failing patch file (use --debug to get all the details)." + fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." + exit 1 +fi diff --git a/global.json b/global.json index fb35fa5b26ca..aecd40db3926 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-preview.4.25216.37" + "version": "10.0.100-preview.5.25265.106" }, "tools": { - "dotnet": "10.0.100-preview.4.25216.37", + "dotnet": "10.0.100-preview.5.25265.106", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25265.101", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25265.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25272.109", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25272.109", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25272.109", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 5fbb006e9c3fa6c52f19ab904fe9423e01c8e756 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 28 May 2025 10:40:14 -0500 Subject: [PATCH 3/6] Fix build script --- eng/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/build.sh b/eng/build.sh index 6eb08928ca50..f1a58161c1ee 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -265,6 +265,7 @@ while [[ $# -gt 0 ]]; do ;; -fromvmr|-from-vmr) from_vmr=true + ;; -warnaserror) shift [ -z "${1:-}" ] && __error "Missing value for parameter --warnaserror" && __usage From 6842c776577b8b3968641d39ebce4f8d158be803 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 May 2025 15:43:13 +0000 Subject: [PATCH 4/6] [VMR] Codeflow c912eee-c912eee [[ commit created by automation ]] --- eng/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/build.sh b/eng/build.sh index f1a58161c1ee..91e398561b8b 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -39,6 +39,7 @@ source_build='' product_build='' from_vmr='' warn_as_error=true +from_vmr='' if [ "$(uname)" = "Darwin" ]; then target_os_name='osx' From 4fc9d408f834e90e6fdf7152488029532d97aedf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 May 2025 15:43:21 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/dotnet build 269724 No dependency updates to commit --- eng/Version.Details.xml | 370 ++++++++++++++++++++-------------------- eng/Versions.props | 178 +++++++++---------- eng/common/build.sh | 2 +- eng/common/tools.ps1 | 1 - eng/common/tools.sh | 2 - global.json | 10 +- 6 files changed, 280 insertions(+), 283 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a5c89a711eb..51539f8ffa0e 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 - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d @@ -357,52 +357,52 @@ https://github.com/dotnet/roslyn afdd413cee50c16318620252e4e64dc326e2d300 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 913f703e8124..c33dd843af30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,97 +67,97 @@ --> - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 + 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.25272.109 - 10.0.0-preview.6.25272.109 + 10.0.0-preview.6.25277.102 + 10.0.0-preview.6.25277.102 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 + 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 9.6.0-preview.1.25271.2 9.6.0-preview.1.25271.2 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 - 10.0.0-preview.6.25272.109 + 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.100-preview.6.25272.109 - 10.0.100-preview.6.25272.109 + 10.0.100-preview.6.25277.102 + 10.0.100-preview.6.25277.102 4.13.0-3.24613.7 @@ -170,12 +170,12 @@ 6.2.4 6.2.4 - 10.0.0-beta.25272.109 - 10.0.0-beta.25272.109 - 10.0.0-beta.25272.109 - 10.0.0-beta.25272.109 + 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-preview.25272.109 + 10.0.0-preview.25277.102 1.0.0-prerelease.25217.3 1.0.0-prerelease.25217.3 diff --git a/eng/common/build.sh b/eng/common/build.sh index b105db583c40..9767bb411a4f 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -257,7 +257,7 @@ function Build { /p:Sign=$sign \ /p:Publish=$publish \ /p:RestoreStaticGraphEnableBinaryLogger=$binary_log \ - "${properties[@]}" + ${properties[@]+"${properties[@]}"} ExitWithExitCode 0 } diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 046ec9d08a0f..c9e39595b586 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -644,7 +644,6 @@ function GetNuGetPackageCachePath() { $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\' } else { $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\' - $env:RESTORENOHTTPCACHE = $true } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 8bc68e8460f0..28944dfcb3f4 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -345,14 +345,12 @@ function InitializeBuildTool { _InitializeBuildToolCommand="msbuild" } -# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116 function GetNuGetPackageCachePath { if [[ -z ${NUGET_PACKAGES:-} ]]; then if [[ "$use_global_nuget_cache" == true ]]; then export NUGET_PACKAGES="$HOME/.nuget/packages/" else export NUGET_PACKAGES="$repo_root/.packages/" - export RESTORENOHTTPCACHE=true fi fi diff --git a/global.json b/global.json index aecd40db3926..315dcb58e2cb 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-preview.5.25265.106" + "version": "10.0.100-preview.6.25272.112" }, "tools": { - "dotnet": "10.0.100-preview.5.25265.106", + "dotnet": "10.0.100-preview.6.25272.112", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25272.109", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25272.109", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25272.109", + "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.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 49118b76de68a266925efa4be0cb531ddb7d9da3 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 28 May 2025 16:27:02 -0500 Subject: [PATCH 6/6] Align M.CA package versions --- eng/Dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 81c068cca69f..7d944888c843 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -265,10 +265,10 @@ and are generated based on the last package release. $(MicrosoftCodeAnalysisVersion_LatestVS) - $(Analyzer_MicrosoftCodeAnalysisCSharpVersion) + $(MicrosoftCodeAnalysisVersion_LatestVS) - $(Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion) + $(MicrosoftCodeAnalysisVersion_LatestVS) $(MicrosoftCodeAnalysisVersion_LatestVS)