From c46f51c0e5b08ff3eebaa3104ff51735c29322cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 20:07:45 +0200 Subject: [PATCH 1/8] [release/10.0-rc1] Source code updates from dotnet/dotnet (#36589) * Update dependencies from https://github.com/dotnet/dotnet build 279601 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25414.103 -> 10.0.0-beta.25415.113) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.1.25414.103 -> 10.0.0-rc.1.25415.113) * Update dependencies from https://github.com/dotnet/dotnet build 279607 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25415.113 -> 10.0.0-beta.25416.107) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.1.25415.113 -> 10.0.0-rc.1.25416.107) * Backflow from https://github.com/dotnet/dotnet / 4584978 build 279620 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 279620 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25416.107 -> 10.0.0-beta.25416.111) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.1.25416.107 -> 10.0.0-rc.1.25416.111) * Update dependencies from https://github.com/dotnet/dotnet build 279630 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25416.111 -> 10.0.0-beta.25416.112) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.1.25416.111 -> 10.0.0-rc.1.25416.112) --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 3 +- eng/Version.Details.props | 36 +++++++++---------- eng/Version.Details.xml | 74 +++++++++++++++++++-------------------- global.json | 4 +-- 4 files changed, 58 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f229668683..9f7e9703800 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,5 +1,4 @@ - @@ -28,4 +27,4 @@ - \ No newline at end of file + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 457368f1652..eb3e87d2d83 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,24 +7,24 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25414.103 - 10.0.0-beta.25414.103 - 10.0.0-beta.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 + 10.0.0-beta.25416.112 + 10.0.0-beta.25416.112 + 10.0.0-beta.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 + 10.0.0-rc.1.25416.112 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdb5a54a078..d078897a2c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 8c49b059243665b9c1a4ce01c24bedb4f5641f15 diff --git a/global.json b/global.json index 7be1df1bfba..c4f17295a17 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25414.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25414.103" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.112", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.112" } } From 69f50fe65f373ffd71239d75fdec44d66c5c2fdc Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Mon, 18 Aug 2025 21:26:15 +0200 Subject: [PATCH 2/8] Temporarily disable the JSON data type on Azure SQL (#36596) --- .../Infrastructure/Internal/SqlServerSingletonOptions.cs | 6 +++++- .../Storage/SqlServerTypeMappingSourceTest.cs | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/EFCore.SqlServer/Infrastructure/Internal/SqlServerSingletonOptions.cs b/src/EFCore.SqlServer/Infrastructure/Internal/SqlServerSingletonOptions.cs index 98c5f8727ee..90b43fe769b 100644 --- a/src/EFCore.SqlServer/Infrastructure/Internal/SqlServerSingletonOptions.cs +++ b/src/EFCore.SqlServer/Infrastructure/Internal/SqlServerSingletonOptions.cs @@ -70,7 +70,11 @@ public virtual bool SupportsJsonType => EngineType switch { SqlServerEngineType.SqlServer => SqlServerCompatibilityLevel >= 170, - SqlServerEngineType.AzureSql => AzureSqlCompatibilityLevel >= 170, + // TODO: #36460 + // At the time of writing, Azure SQL Database does not yet support OPENJSON over the JSON data type. + // This should get reenabled by the time we GA. + SqlServerEngineType.AzureSql => false, + // SqlServerEngineType.AzureSql => AzureSqlCompatibilityLevel >= 170, SqlServerEngineType.AzureSynapse => false, SqlServerEngineType.Unknown => false, // TODO: We shouldn't observe Unknown here, #36477 _ => throw new UnreachableException() diff --git a/test/EFCore.SqlServer.Tests/Storage/SqlServerTypeMappingSourceTest.cs b/test/EFCore.SqlServer.Tests/Storage/SqlServerTypeMappingSourceTest.cs index 6a19f0a3b8c..1859ff057cd 100644 --- a/test/EFCore.SqlServer.Tests/Storage/SqlServerTypeMappingSourceTest.cs +++ b/test/EFCore.SqlServer.Tests/Storage/SqlServerTypeMappingSourceTest.cs @@ -1588,8 +1588,13 @@ public void Json_is_mapped_to_json_type_with_UseAzureSql_by_default() { var typeMappingSource = CreateTypeMappingSource(o => o.UseAzureSql()); - Assert.Equal("json", typeMappingSource.GetMapping(typeof(JsonTypePlaceholder)).StoreType); - Assert.Equal("json", typeMappingSource.GetMapping(typeof(int[])).StoreType); + // TODO: #36460 + // At the time of writing, Azure SQL Database does not yet support OPENJSON over the JSON data type. + // This should get reenabled by the time we GA. + Assert.Equal("nvarchar(max)", typeMappingSource.GetMapping(typeof(JsonTypePlaceholder)).StoreType); + Assert.Equal("nvarchar(max)", typeMappingSource.GetMapping(typeof(int[])).StoreType); + // Assert.Equal("json", typeMappingSource.GetMapping(typeof(JsonTypePlaceholder)).StoreType); + // Assert.Equal("json", typeMappingSource.GetMapping(typeof(int[])).StoreType); } [ConditionalFact] From 66786d197f3d617a45586f65f488983918ef0bc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 14:45:22 +0200 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/dotnet build 279877 (#36602) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25416.112 -> 10.0.0-beta.25418.110) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.1.25416.112 -> 10.0.0-rc.1.25418.110) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 36 +++++++++---------- eng/Version.Details.xml | 74 +++++++++++++++++++-------------------- global.json | 4 +-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index eb3e87d2d83..884c122e89e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,24 +7,24 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25416.112 - 10.0.0-beta.25416.112 - 10.0.0-beta.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 - 10.0.0-rc.1.25416.112 + 10.0.0-beta.25418.110 + 10.0.0-beta.25418.110 + 10.0.0-beta.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 + 10.0.0-rc.1.25418.110 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d078897a2c3..aef746a295b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b - + https://github.com/dotnet/dotnet - 8c49b059243665b9c1a4ce01c24bedb4f5641f15 + 60fecc0f99696a998bfd1fca8ed314bc591a3b9b diff --git a/global.json b/global.json index c4f17295a17..24883b0b1ba 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.112", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.112" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25418.110", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25418.110" } } From 851aa3098819ff9db9568cd50b9321fdd6d47460 Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Wed, 20 Aug 2025 11:58:08 -0700 Subject: [PATCH 4/8] Fix whitespace in Microsoft.EntityFrameworkCore.Tasks.props (#36610) Fixes #36605 --- .../Microsoft.EntityFrameworkCore.Tasks.props | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.props b/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.props index 2d467ddd27f..ada2ba63398 100644 --- a/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.props +++ b/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.props @@ -4,10 +4,7 @@ <_TaskTargetFramework Condition="'$(MSBuildRuntimeType)' == 'core'">net10.0 <_TaskTargetFramework Condition="'$(MSBuildRuntimeType)' != 'core'">net472 - <_EFCustomTasksAssembly> - $([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), - '..\tasks\$(_TaskTargetFramework)\$(MSBuildThisFileName).dll')) - + <_EFCustomTasksAssembly>$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory),'..\tasks\$(_TaskTargetFramework)\$(MSBuildThisFileName).dll')) publish publish * From 5eedebfa7e0466c7c352e694a08913541db0c156 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Aug 2025 08:55:23 +0000 Subject: [PATCH 5/8] Update dependencies from https://github.com/dotnet/dotnet build 280250 (#36623) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25418.110 -> 10.0.0-beta.25420.111) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.1.25418.110 -> 10.0.0-rc.1.25420.111) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 36 +++++++++---------- eng/Version.Details.xml | 74 +++++++++++++++++++-------------------- global.json | 4 +-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 884c122e89e..02c300b1d28 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,24 +7,24 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25418.110 - 10.0.0-beta.25418.110 - 10.0.0-beta.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 - 10.0.0-rc.1.25418.110 + 10.0.0-beta.25420.111 + 10.0.0-beta.25420.111 + 10.0.0-beta.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 + 10.0.0-rc.1.25420.111 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aef746a295b..bf1535b5e93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 - + https://github.com/dotnet/dotnet - 60fecc0f99696a998bfd1fca8ed314bc591a3b9b + 6218c7cdc745d1633718b5474be71b4ddb2cedf2 diff --git a/global.json b/global.json index 24883b0b1ba..7c39f396e18 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25418.110", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25418.110" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.111", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.111" } } From 310ec07f9ef37ab80295fe02acc5de7ff202344e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 08:25:32 +0000 Subject: [PATCH 6/8] Update dependencies from https://github.com/dotnet/dotnet build 280414 (#36636) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25420.111 -> 10.0.0-beta.25421.113) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.1.25420.111 -> 10.0.0-rc.1.25421.113) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 36 ++++----- eng/Version.Details.xml | 74 +++++++++---------- eng/common/SetupNugetSources.ps1 | 4 +- eng/common/SetupNugetSources.sh | 4 +- eng/common/core-templates/job/job.yml | 6 +- eng/common/core-templates/job/onelocbuild.yml | 6 +- .../job/publish-build-assets.yml | 10 ++- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 2 + .../core-templates/post-build/post-build.yml | 8 +- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +-- .../core-templates/steps/generate-sbom.yml | 2 +- .../steps/install-microbuild.yml | 47 +++++++----- .../core-templates/steps/publish-logs.yml | 14 ++-- .../steps/source-index-stage1-publish.yml | 6 +- eng/common/generate-locproject.ps1 | 49 ++++++++++-- eng/common/sdk-task.ps1 | 3 +- eng/common/sdk-task.sh | 7 +- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 +- eng/common/tools.ps1 | 6 +- global.json | 8 +- 25 files changed, 189 insertions(+), 129 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 02c300b1d28..c12b87e55a2 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,24 +7,24 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25420.111 - 10.0.0-beta.25420.111 - 10.0.0-beta.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 - 10.0.0-rc.1.25420.111 + 10.0.0-beta.25421.113 + 10.0.0-beta.25421.113 + 10.0.0-beta.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 + 10.0.0-rc.1.25421.113 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf1535b5e93..2cbc32e454f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet - 6218c7cdc745d1633718b5474be71b4ddb2cedf2 + d5539bb825f9d1376b6002463dd26f9e8c5a570f diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71ee2..792b60b49d4 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b032..facb415ca6f 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index d9013251542..5ce51840619 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -163,7 +163,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -174,7 +174,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -218,7 +218,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 8bf7d23355b..c5788829a87 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -103,7 +103,7 @@ jobs: - task: CopyFiles@2 displayName: Copy LocProject.json inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/Localize/' Contents: 'LocProject.json' TargetFolder: '$(Build.ArtifactStagingDirectory)/loc' condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index d5303229c97..348cd16376f 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -38,6 +38,8 @@ parameters: # Optional: A minimatch pattern for the asset manifests to publish to BAR assetManifestsPattern: '*/manifests/**/*.xml' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -78,7 +80,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -117,7 +119,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} @@ -137,7 +139,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -177,7 +179,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index 693b00b3704..dbc14ac580a 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -24,7 +24,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 2f992b2c6ec..b637cb6e948 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -114,3 +115,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a151fd811e3..f6f87fe5c67 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -154,7 +154,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -208,7 +208,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -258,7 +258,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -313,7 +313,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980dbe..a7abd58c4bb 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bffc3..4085512b690 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 44a9636cdff..c05f6502797 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 10.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index da30e67bc34..d6b9878f54d 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -12,6 +12,7 @@ parameters: # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true # Location of the MicroBuild output folder + # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. microBuildOutputFolder: '$(Build.SourcesDirectory)' continueOnError: false @@ -46,17 +47,19 @@ steps: displayName: 'Validate ESRP usage (Non-Windows)' condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + # Two different MB install steps. This is due to not being able to use the agent OS during + # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, + # we can avoid including the MB install step if not enabled at all. This avoids a bunch of + # extra pipeline authorizations, since most pipelines do not sign on non-Windows. - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin + displayName: Install MicroBuild plugin (Windows) inputs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json ${{ if eq(parameters.microbuildUseESRP, true) }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - azureSubscription: 'MicroBuild Signing Task (DevDiv)' - useEsrpCli: true - ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea ${{ else }}: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca @@ -65,16 +68,24 @@ steps: MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} - condition: and( - succeeded(), - or( - and( - eq(variables['Agent.Os'], 'Windows_NT'), - in(variables['_SignType'], 'real', 'test') - ), - and( - ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, - ne(variables['Agent.Os'], 'Windows_NT'), - eq(variables['_SignType'], 'real') - ) - )) + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) + + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin (non-Windows) + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ${{ else }}: + ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc + env: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index de24d0087c5..10f825e270a 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -44,7 +44,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' condition: always() diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index c2917c1efc1..e9a694afa58 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,6 +1,6 @@ parameters: - sourceIndexUploadPackageVersion: 2.0.0-20250425.2 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1 + sourceIndexUploadPackageVersion: 2.0.0-20250818.1 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json binlogPath: artifacts/log/Debug/Build.binlog @@ -20,7 +20,7 @@ steps: # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) -- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output +- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: "Source Index: Process Binlog into indexable sln" - ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 524aaa57f2b..fa1cdc2b300 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -33,15 +33,27 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$wxlFilesV3 = @() +$wxlFilesV5 = @() $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them if (-not $wxlFiles) { $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files if ($wxlEnFiles) { - $wxlFiles = @() - $wxlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $content = Get-Content $_.FullName -Raw + + # Split files on schema to select different parser settings in the generated project. + if ($content -like "*http://wixtoolset.org/schemas/v4/wxl*") + { + $wxlFilesV5 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + elseif ($content -like "*http://schemas.microsoft.com/wix/2006/localization*") + { + $wxlFilesV3 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + } } } @@ -114,7 +126,32 @@ $locJson = @{ CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( - $wxlFiles | ForEach-Object { + $wxlFilesV3 | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) + { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "WiX_CloneLanguages" + LssFiles = @( "P210WxlSchemaV4.lss" ) + LocItems = @( + $wxlFilesV5 | ForEach-Object { $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index a9d2a2d2699..b62e132d32a 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -7,13 +7,14 @@ Param( [switch] $restore, [switch] $prepareMachine, [switch][Alias('nobl')]$excludeCIBinaryLog, + [switch]$noWarnAsError, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) $ci = $true $binaryLog = if ($excludeCIBinaryLog) { $false } else { $true } -$warnAsError = $true +$warnAsError = if ($noWarnAsError) { $false } else { $true } . $PSScriptRoot\tools.ps1 diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index 2f83adc0269..0c92f81d74f 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -10,6 +10,7 @@ show_usage() { echo "Advanced settings:" echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" + echo " --noWarnAsError Do not warn as error echo "" echo "Command line arguments not listed above are passed thru to msbuild." } @@ -52,6 +53,7 @@ exclude_ci_binary_log=false restore=false help=false properties='' +warnAsError=true while (($# > 0)); do lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" @@ -73,6 +75,10 @@ while (($# > 0)); do exclude_ci_binary_log=true shift 1 ;; + --noWarnAsError) + warnAsError=false + shift 1 + ;; --help) help=true shift 1 @@ -85,7 +91,6 @@ while (($# > 0)); do done ci=true -warnAsError=true if $help; then show_usage diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded0b..4bf4cf41bd7 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a8a94328745..92a0664f564 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b..f1311bbb1b3 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 7cbf668c22b..238fa0818f7 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -77,7 +77,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index d4cfd9ccd80..06b44de7870 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -544,7 +544,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') { $vswhereVersion = $GlobalJson.tools.vswhere } else { - $vswhereVersion = '2.5.2' + # keep this in sync with the VSWhereVersion in DefaultVersions.props + $vswhereVersion = '3.1.7' } $vsWhereDir = Join-Path $ToolsDir "vswhere\$vswhereVersion" @@ -552,7 +553,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir - Write-Host 'Downloading vswhere' + Write-Host "Downloading vswhere $vswhereVersion" + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe }) diff --git a/global.json b/global.json index 7c39f396e18..14742d8a7e5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25411.109", + "version": "10.0.100-rc.1.25420.111", "allowPrerelease": true, "rollForward": "latestMajor", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./restore.sh or .\\restore.cmd to install it." }, "tools": { - "dotnet": "10.0.100-rc.1.25411.109", + "dotnet": "10.0.100-rc.1.25420.111", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.111", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.111" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25421.113", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25421.113" } } From a5241ef3584f8ed9a96a7b87eb3a0e728951e061 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 10:20:22 +0000 Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/dotnet build 280419 (#36638) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25421.113 -> 10.0.0-beta.25421.120) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.1.25421.113 -> 10.0.0-rc.1.25421.120) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 36 ++++++++++++++++++------------------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- global.json | 4 ++-- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c12b87e55a2..0668bae24c2 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,24 +7,24 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25421.113 - 10.0.0-beta.25421.113 - 10.0.0-beta.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 - 10.0.0-rc.1.25421.113 + 10.0.0-beta.25421.120 + 10.0.0-beta.25421.120 + 10.0.0-beta.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 + 10.0.0-rc.1.25421.120 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2cbc32e454f..d9b0af087fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f - + https://github.com/dotnet/dotnet d5539bb825f9d1376b6002463dd26f9e8c5a570f diff --git a/global.json b/global.json index 14742d8a7e5..29e0168f1c4 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25421.113", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25421.113" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25421.120", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25421.120" } } From b6c5ca3ecba09aeb3cfe909aa3920b9418c4b672 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Aug 2025 11:14:54 -0700 Subject: [PATCH 8/8] Update dependencies from https://github.com/dotnet/dotnet build 280549 (#36641) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25421.120 -> 10.0.0-beta.25422.107) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.1.25421.120 -> 10.0.0-rc.1.25422.107) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 36 +++++++++---------- eng/Version.Details.xml | 74 +++++++++++++++++++-------------------- global.json | 4 +-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0668bae24c2..0cc53012f7d 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,24 +7,24 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25421.120 - 10.0.0-beta.25421.120 - 10.0.0-beta.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 - 10.0.0-rc.1.25421.120 + 10.0.0-beta.25422.107 + 10.0.0-beta.25422.107 + 10.0.0-beta.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 + 10.0.0-rc.1.25422.107 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9b0af087fe..9d8ee6f4888 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d - + https://github.com/dotnet/dotnet - d5539bb825f9d1376b6002463dd26f9e8c5a570f + 7f7a0a3a9390835a3666f5ca0e9c687bf7eaea5d diff --git a/global.json b/global.json index 29e0168f1c4..5aa128f3d11 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25421.120", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25421.120" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25422.107", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25422.107" } }