From 138720d278a2d51fbbc4c1045102ccac68252b8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Nov 2025 02:02:32 +0000 Subject: [PATCH 1/4] Backflow from https://github.com/dotnet/dotnet / e17b0d0 build 289695 [[ commit created by automation ]] --- eng/Versions.props | 13 ++++++------- src/Layout/redist/roslyn-entitlements.plist | 16 ++++++++++++++++ src/Layout/redist/targets/GenerateLayout.targets | 3 +++ .../redist/targets/OverlaySdkOnLKG.targets | 2 ++ .../Microsoft.CodeAnalysis.NetAnalyzers.sarif | 6 +++--- 5 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 src/Layout/redist/roslyn-entitlements.plist diff --git a/eng/Versions.props b/eng/Versions.props index cfd965a85e6d..0a5f99ca17b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,8 @@ 10 0 1 - 00 + 1 + $([System.String]::Copy('$(VersionSDKMinorPatch)').PadLeft(2, '0')) @@ -20,10 +21,8 @@ false release - rtm - rtm - servicing - + servicing + @@ -111,7 +110,7 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.8 + 17.14.28 18.0 @@ -125,7 +124,7 @@ - 1.8.1 + 1.10.2 4.0.1 diff --git a/src/Layout/redist/roslyn-entitlements.plist b/src/Layout/redist/roslyn-entitlements.plist new file mode 100644 index 000000000000..168fce4fcd87 --- /dev/null +++ b/src/Layout/redist/roslyn-entitlements.plist @@ -0,0 +1,16 @@ + + + + + com.apple.security.cs.allow-jit + + com.apple.security.cs.allow-dyld-environment-variables + + com.apple.security.cs.disable-library-validation + + com.apple.security.cs.debugger + + com.apple.security.get-task-allow + + + diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 0b5bcb6fa182..446da1bc096b 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -65,6 +65,9 @@ AppBinaryName="%(_RoslynAppHost.Filename)%(_RoslynAppHost.Extension)" IntermediateAssembly="%(_RoslynAppHost.FullPath)" EnableMacOSCodeSign="$(SharedFrameworkRid.StartsWith('osx'))" /> + + diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets index faf995466d4f..54a82b807a82 100644 --- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets +++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets @@ -31,6 +31,8 @@ + Date: Sat, 8 Nov 2025 02:02:41 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/dotnet build 289695 Updated Dependencies: dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.NET.HostModel, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.NETCore.Platforms, Microsoft.WindowsDesktop.App.Internal (Version 10.0.0-rtm.25520.117 -> 10.0.1-servicing.25555.106) Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.Web, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.TestHost, Microsoft.Bcl.AsyncInterfaces, Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Embedded, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.ObjectPool, Microsoft.JSInterop, Microsoft.NET.ILLink.Tasks, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NETCore.App.Ref, Microsoft.Win32.SystemEvents, Microsoft.WindowsDesktop.App.Ref, System.CodeDom, System.ComponentModel.Composition, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Formats.Asn1, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encoding.CodePages, System.Text.Json, System.Windows.Extensions (Version 10.0.0 -> 10.0.1) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25520.117 -> 10.0.0-preview.25555.106) Microsoft.Build (Version 18.0.0 -> 18.0.3) Microsoft.Build.Localization (Version 18.0.0-servicing-25520-117 -> 18.0.3-servicing-25555-106) Microsoft.Build.NuGetSdkResolver, NuGet.Build.Tasks, NuGet.Build.Tasks.Console, NuGet.Build.Tasks.Pack, NuGet.CommandLine.XPlat, NuGet.Commands, NuGet.Common, NuGet.Configuration, NuGet.Credentials, NuGet.DependencyResolver.Core, NuGet.Frameworks, NuGet.LibraryModel, NuGet.Localization, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.0.0-rc.2117 -> 7.0.0-rc.5606) Microsoft.Build.Tasks.Git, Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 10.0.0-beta.25520.117 -> 10.0.0-beta.25555.106) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.0.0-2.25520.117 -> 5.0.0-2.25555.106) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25520.117 -> 2.0.0-preview.1.25555.106) Microsoft.DiaSymReader (Version 2.2.0-beta.25520.117 -> 2.2.0-beta.25555.106) Microsoft.FSharp.Compiler (Version 14.0.100-rc2.25520.117 -> 14.0.101-servicing.25555.106) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.0.1-release-25520-117 -> 18.0.1-release-25555-106) Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common (Version 10.0.100 -> 10.0.101) Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-rtm.25520.117 -> 10.0.101-servicing.25555.106) Microsoft.Web.Xdt (Version 3.2.0-preview.25520.117 -> 3.2.0-preview.25555.106) System.CommandLine (Version 2.0.0 -> 2.0.1) --- NuGet.config | 2 +- eng/Version.Details.props | 260 ++++----- eng/Version.Details.xml | 522 +++++++++--------- eng/common/SetupNugetSources.ps1 | 17 +- eng/common/SetupNugetSources.sh | 17 +- .../steps/install-microbuild.yml | 15 +- global.json | 4 +- 7 files changed, 431 insertions(+), 406 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3ae2b9522235..0eed4bfa24ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index fb222acd1dae..c02f16a447e7 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,137 +6,137 @@ This file should be imported by eng/Versions.props - 10.0.0-rtm.25520.117 - 10.0.0-rtm.25520.117 - 10.0.0-rtm.25520.117 - 10.0.0-rtm.25520.117 - 10.0.0 - 10.0.0-rtm.25520.117 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0-rtm.25520.117 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0-rtm.25520.117 - 10.0.0 - 10.0.0-rtm.25520.117 - 10.0.0-rtm.25520.117 - 10.0.0-preview.25520.117 - 10.0.0 - 10.0.0 - 18.0.0 - 18.0.0-servicing-25520-117 - 7.0.0-rc.2117 - 10.0.0-beta.25520.117 - 5.0.0-2.25520.117 - 5.0.0-2.25520.117 - 5.0.0-2.25520.117 - 5.0.0-2.25520.117 - 5.0.0-2.25520.117 - 5.0.0-2.25520.117 - 5.0.0-2.25520.117 - 10.0.0-preview.25520.117 - 5.0.0-2.25520.117 - 5.0.0-2.25520.117 - 2.0.0-preview.1.25520.117 - 2.2.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0 - 10.0.0 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 14.0.100-rc2.25520.117 - 10.0.0 - 5.0.0-2.25520.117 - 5.0.0-2.25520.117 - 10.0.0-rtm.25520.117 - 10.0.0 - 10.0.0 + 10.0.1-servicing.25555.106 + 10.0.1-servicing.25555.106 + 10.0.1-servicing.25555.106 + 10.0.1-servicing.25555.106 + 10.0.1 + 10.0.1-servicing.25555.106 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25555.106 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25555.106 + 10.0.1 + 10.0.1-servicing.25555.106 + 10.0.1-servicing.25555.106 + 10.0.0-preview.25555.106 + 10.0.1 + 10.0.1 + 18.0.3 + 18.0.3-servicing-25555-106 + 7.0.0-rc.5606 + 10.0.0-beta.25555.106 + 5.0.0-2.25555.106 + 5.0.0-2.25555.106 + 5.0.0-2.25555.106 + 5.0.0-2.25555.106 + 5.0.0-2.25555.106 + 5.0.0-2.25555.106 + 5.0.0-2.25555.106 + 10.0.0-preview.25555.106 + 5.0.0-2.25555.106 + 5.0.0-2.25555.106 + 2.0.0-preview.1.25555.106 + 2.2.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.1 + 10.0.1 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 14.0.101-servicing.25555.106 + 10.0.1 + 5.0.0-2.25555.106 + 5.0.0-2.25555.106 + 10.0.1-servicing.25555.106 + 10.0.1 + 10.0.1 10.0.0-preview.7.25377.103 - 10.0.0-preview.25520.117 - 10.0.0-rtm.25520.117 - 18.0.1-release-25520-117 - 10.0.0 - 10.0.0-rtm.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.100 - 10.0.100 - 10.0.100 - 10.0.100-rtm.25520.117 - 10.0.100 - 10.0.100-rtm.25520.117 - 10.0.100 - 10.0.100 - 10.0.100-rtm.25520.117 - 18.0.1-release-25520-117 - 18.0.1-release-25520-117 - 3.2.0-preview.25520.117 - 10.0.0 - 10.0.0-rtm.25520.117 - 10.0.0 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 7.0.0-rc.2117 - 10.0.0 - 2.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 + 10.0.0-preview.25555.106 + 10.0.1-servicing.25555.106 + 18.0.1-release-25555-106 + 10.0.1 + 10.0.1-servicing.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.101 + 10.0.101 + 10.0.101 + 10.0.101-servicing.25555.106 + 10.0.101 + 10.0.101-servicing.25555.106 + 10.0.101 + 10.0.101 + 10.0.101-servicing.25555.106 + 18.0.1-release-25555-106 + 18.0.1-release-25555-106 + 3.2.0-preview.25555.106 + 10.0.1 + 10.0.1-servicing.25555.106 + 10.0.1 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 7.0.0-rc.5606 + 10.0.1 + 2.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 2.1.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2b9078e311c..1b030065ccb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/microsoft/testfx @@ -561,9 +561,9 @@ https://github.com/microsoft/testfx 36a23010d6fb8062381e5a7e9f766c4e4e1ad8e0 - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + e17b0d08def649f30aed9c09cf4a2c5741a3c76c diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index fc8d618014e0..65ed3a8adef0 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -1,6 +1,7 @@ # This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables -# disabled internal Maestro (darc-int*) feeds. +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly, +# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present. +# In addition, this script also enables disabled internal Maestro (darc-int*) feeds. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) { } } +# Check for dotnet-eng and add dotnet-eng-internal if present +$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']") +if ($dotnetEngSource -ne $null) { + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password +} + +# Check for dotnet-tools and add dotnet-tools-internal if present +$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']") +if ($dotnetToolsSource -ne $null) { + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password +} + $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index b97cc536379d..b2163abbe71b 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -1,8 +1,9 @@ #!/usr/bin/env bash # This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables -# disabled internal Maestro (darc-int*) feeds. +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly, +# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present. +# In addition, this script also enables disabled internal Maestro (darc-int*) feeds. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do fi done +# Check for dotnet-eng and add dotnet-eng-internal if present +grep -i " /dev/null +if [ "$?" == "0" ]; then + AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix" +fi + +# Check for dotnet-tools and add dotnet-tools-internal if present +grep -i " /dev/null +if [ "$?" == "0" ]; then + AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix" +fi + # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index d6b9878f54db..f2248ebfd730 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -11,23 +11,22 @@ parameters: # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The # 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 steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable + # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin inputs: packageType: sdk version: 8.0.x - installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet - workingDirectory: ${{ parameters.microBuildOutputFolder }} + # Installing the SDK in a '.dotnet-microbuild' directory is required for signing. + # See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj + # Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic. + installationPath: $(Agent.TempDirectory)/.dotnet-microbuild condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -65,7 +64,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -85,7 +84,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc env: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/global.json b/global.json index 835c99d48dce..89fdfc4c6429 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25520.117", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25520.117", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25555.106", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25555.106", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 127cce5c4b79ae61dd02bd98089103d2cff429ee Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 11 Nov 2025 19:12:16 -0500 Subject: [PATCH 3/4] Fix workload manifest package prerelease label for servicing --- src/Workloads/Manifests/Directory.Build.props | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Workloads/Manifests/Directory.Build.props b/src/Workloads/Manifests/Directory.Build.props index b627384a33f3..89470be112a3 100644 --- a/src/Workloads/Manifests/Directory.Build.props +++ b/src/Workloads/Manifests/Directory.Build.props @@ -15,8 +15,9 @@ - <_workloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and '$(PrereleaseVersionLabel)' != 'rtm'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) - <_workloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and '$(PrereleaseVersionLabel)' != 'rtm'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) + <_workloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and + '$(PrereleaseVersionLabel)' != 'rtm' and + '$(PrereleaseVersionLabel)' != 'servicing'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) $(MSBuildProjectName)-$(BuiltinWorkloadFeatureBand)$(_workloadVersionSuffix) Microsoft.NET.Workload.Emscripten.Current.Manifest-$(BuiltinWorkloadFeatureBand).Transport From bddce542d144354623002da7422c48cd4742ef91 Mon Sep 17 00:00:00 2001 From: Jan Jones Date: Fri, 14 Nov 2025 12:46:51 +0100 Subject: [PATCH 4/4] Use default runtime version in runtimeconfig.json same as MSBuild-based build would --- .../Commands/Run/CSharpCompilerCommand.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.cs b/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.cs index ac20c4286ba0..1dba81c63dc5 100644 --- a/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.cs +++ b/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.cs @@ -12,6 +12,7 @@ using Microsoft.DotNet.Cli.Utils.Extensions; using Microsoft.NET.HostModel.AppHost; using NuGet.Configuration; +using NuGet.Versioning; namespace Microsoft.DotNet.Cli.Commands.Run; @@ -44,6 +45,7 @@ internal sealed partial class CSharpCompilerCommand private static string ClientDirectory => field ??= Path.Combine(SdkPath, "Roslyn", "bincore"); private static string NuGetCachePath => field ??= SettingsUtility.GetGlobalPackagesFolder(Settings.LoadDefaultSettings(null)); internal static string RuntimeVersion => field ??= RuntimeInformation.FrameworkDescription.Split(' ').Last(); + private static string DefaultRuntimeVersion => field ??= GetDefaultRuntimeVersion(); private static string TargetFrameworkVersion => Product.TargetFrameworkVersion; public required string EntryPointFileFullPath { get; init; } @@ -285,7 +287,7 @@ private void PrepareAuxiliaryFiles(out string rspPath) "tfm": "net{{TargetFrameworkVersion}}", "framework": { "name": "Microsoft.NETCore.App", - "version": {{JsonSerializer.Serialize(RuntimeVersion)}} + "version": {{JsonSerializer.Serialize(DefaultRuntimeVersion)}} }, "configProperties": { "EntryPointFilePath": {{JsonSerializer.Serialize(EntryPointFileFullPath)}}, @@ -387,4 +389,19 @@ public static bool IsPathOption(string arg, out int colonIndex) colonIndex = -1; return false; } + + /// + /// See GenerateDefaultRuntimeFrameworkVersion. + /// + private static string GetDefaultRuntimeVersion() + { + if (NuGetVersion.TryParse(RuntimeVersion, out var version)) + { + return version.IsPrerelease && version.Patch == 0 ? + RuntimeVersion : + new NuGetVersion(version.Major, version.Minor, 0).ToFullString(); + } + + return RuntimeVersion; + } }