From 96a65bc19ec23707fac75c675e8e8b9d3b4a1b26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Oct 2025 02:05:36 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/dotnet build 20251006.3 On relative base path root 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 From Version 10.0.0-rtm.25515.111 -> To Version 10.0.0-rc.2.25506.103 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 From Version 10.0.0 -> To Version 10.0.0-rc.2.25506.103 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 10.0.0-preview.25515.111 -> To Version 10.0.0-preview.25506.103 Microsoft.Build From Version 18.0.0 -> To Version 18.0.0-preview-25506-103 Microsoft.Build.Localization From Version 18.0.0-servicing-25515-111 -> To Version 18.0.0-preview-25506-103 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 From Version 7.0.0-rc.1611 -> To Version 7.0.0-preview.2.703 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 From Version 10.0.0-beta.25515.111 -> To Version 10.0.0-beta.25506.103 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 From Version 5.0.0-2.25515.111 -> To Version 5.0.0-2.25506.103 Microsoft.Deployment.DotNet.Releases From Version 2.0.0-preview.1.25515.111 -> To Version 2.0.0-preview.1.25506.103 Microsoft.DiaSymReader From Version 2.2.0-beta.25515.111 -> To Version 2.2.0-beta.25506.103 Microsoft.FSharp.Compiler From Version 14.0.100-rc2.25515.111 -> To Version 14.0.100-rc2.25506.103 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 18.0.0-release-25515-111 -> To Version 18.1.0-preview-25506-103 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Authoring.TemplateVerifier , Microsoft.TemplateEngine.Edge , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 10.0.100 -> To Version 10.0.100-rc.2.25506.103 Microsoft.TemplateEngine.Mocks , Microsoft.TemplateEngine.TestHelper , Microsoft.TemplateSearch.TemplateDiscovery From Version 10.0.100-rtm.25515.111 -> To Version 10.0.100-rc.2.25506.103 Microsoft.Web.Xdt From Version 3.2.0-preview.25515.111 -> To Version 3.2.0-preview.25506.103 System.CommandLine From Version 2.0.0 -> To Version 2.0.0-rc.2.25506.103 --- NuGet.config | 1 - eng/Version.Details.props | 260 +++++----- eng/Version.Details.xml | 520 +++++++++---------- eng/common/SetupNugetSources.ps1 | 71 ++- eng/common/SetupNugetSources.sh | 173 +++--- eng/common/post-build/nuget-verification.ps1 | 2 +- global.json | 4 +- 7 files changed, 498 insertions(+), 533 deletions(-) diff --git a/NuGet.config b/NuGet.config index 294a094923f4..ba324adba3b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 6c5c392b5d7d..8f288f1f0a1e 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.25515.111 - 10.0.0-rtm.25515.111 - 10.0.0-rtm.25515.111 - 10.0.0-rtm.25515.111 - 10.0.0 - 10.0.0-rtm.25515.111 - 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.25515.111 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0-rtm.25515.111 - 10.0.0 - 10.0.0-rtm.25515.111 - 10.0.0-rtm.25515.111 - 10.0.0-preview.25515.111 - 10.0.0 - 10.0.0 - 18.0.0 - 18.0.0-servicing-25515-111 - 7.0.0-rc.1611 - 10.0.0-beta.25515.111 - 5.0.0-2.25515.111 - 5.0.0-2.25515.111 - 5.0.0-2.25515.111 - 5.0.0-2.25515.111 - 5.0.0-2.25515.111 - 5.0.0-2.25515.111 - 5.0.0-2.25515.111 - 10.0.0-preview.25515.111 - 5.0.0-2.25515.111 - 5.0.0-2.25515.111 - 2.0.0-preview.1.25515.111 - 2.2.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0 - 10.0.0 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 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.25515.111 - 10.0.0 - 5.0.0-2.25515.111 - 5.0.0-2.25515.111 - 10.0.0-rtm.25515.111 - 10.0.0 - 10.0.0 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-preview.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 18.0.0-preview-25506-103 + 18.0.0-preview-25506-103 + 7.0.0-preview.2.703 + 10.0.0-beta.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 10.0.0-preview.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 2.0.0-preview.1.25506.103 + 2.2.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 14.0.100-rc2.25506.103 + 10.0.0-rc.2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 10.0.0-preview.7.25377.103 - 10.0.0-preview.25515.111 - 10.0.0-rtm.25515.111 - 18.0.0-release-25515-111 - 10.0.0 - 10.0.0-rtm.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.100 - 10.0.100 - 10.0.100 - 10.0.100-rtm.25515.111 - 10.0.100 - 10.0.100-rtm.25515.111 - 10.0.100 - 10.0.100 - 10.0.100-rtm.25515.111 - 18.0.0-release-25515-111 - 18.0.0-release-25515-111 - 3.2.0-preview.25515.111 - 10.0.0 - 10.0.0-rtm.25515.111 - 10.0.0 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 7.0.0-rc.1611 - 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.25506.103 + 10.0.0-rc.2.25506.103 + 18.1.0-preview-25506-103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 18.1.0-preview-25506-103 + 18.1.0-preview-25506-103 + 3.2.0-preview.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 10.0.0-rc.2.25506.103 + 2.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 2.1.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4f121c19936..f4c4b57d1e81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,61 +2,61 @@ - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 https://github.com/microsoft/testfx @@ -561,9 +561,9 @@ https://github.com/microsoft/testfx d4c42dc54c6dd64f61c41349180ab19b621a9895 - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 5558d2da527906dd610d5bfa63177e67e515b5e7 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index fc8d618014e0..9445c3143258 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -7,7 +7,7 @@ # See example call for this script below. # # - task: PowerShell@2 -# displayName: Setup internal Feeds Credentials +# displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 @@ -34,28 +34,19 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 -# Adds or enables the package source with the given name -function AddOrEnablePackageSource($sources, $disabledPackageSources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { - if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource -DisabledPackageSources $disabledPackageSources -Creds $creds -PackageSourceName $SourceName)) { - AddPackageSource -Sources $sources -SourceName $SourceName -SourceEndPoint $SourceEndPoint -Creds $creds -Username $userName -pwd $Password - } -} - # Add source entry to PackageSources function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) { - Write-Host "Adding package source $SourceName" - $packageSource = $doc.CreateElement("add") $packageSource.SetAttribute("key", $SourceName) $packageSource.SetAttribute("value", $SourceEndPoint) $sources.AppendChild($packageSource) | Out-Null } else { - Write-Host "Package source $SourceName already present and enabled." + Write-Host "Package source $SourceName already present." } AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd @@ -68,8 +59,6 @@ function AddCredential($creds, $source, $username, $pwd) { return; } - Write-Host "Inserting credential for feed: " $source - # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -102,27 +91,24 @@ function AddCredential($creds, $source, $username, $pwd) { $passwordElement.SetAttribute("value", $pwd) } -# Enable all darc-int package sources. -function EnableMaestroInternalPackageSources($DisabledPackageSources, $Creds) { - $maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") - ForEach ($DisabledPackageSource in $maestroInternalSources) { - EnableInternalPackageSource -DisabledPackageSources $DisabledPackageSources -Creds $Creds -PackageSourceName $DisabledPackageSource.key +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } -# Enables an internal package source by name, if found. Returns true if the package source was found and enabled, false otherwise. -function EnableInternalPackageSource($DisabledPackageSources, $Creds, $PackageSourceName) { - $DisabledPackageSource = $DisabledPackageSources.SelectSingleNode("add[@key='$PackageSourceName']") - if ($DisabledPackageSource) { - Write-Host "Enabling internal source '$($DisabledPackageSource.key)'." - +function EnablePrivatePackageSources($DisabledPackageSources) { + $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") + ForEach ($DisabledPackageSource in $maestroPrivateSources) { + Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries $DisabledPackageSources.RemoveChild($DisabledPackageSource) - - AddCredential -Creds $creds -Source $DisabledPackageSource.Key -Username $userName -pwd $Password - return $true } - return $false } if (!(Test-Path $ConfigFile -PathType Leaf)) { @@ -135,17 +121,15 @@ $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName $doc.Load($filename) -# Get reference to - fail if none exist +# Get reference to or create one if none exist already $sources = $doc.DocumentElement.SelectSingleNode("packageSources") if ($sources -eq $null) { - Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" - ExitWithExitCode 1 + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null } $creds = $null -$feedSuffix = "v3/index.json" if ($Password) { - $feedSuffix = "v2" # Looks for a node. Create it if none is found. $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") if ($creds -eq $null) { @@ -154,22 +138,33 @@ if ($Password) { } } -$userName = "dn-bot" - # Check for disabledPackageSources; we'll enable any darc-int ones we find there $disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") if ($disabledSources -ne $null) { Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" - EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds + EnablePrivatePackageSources -DisabledPackageSources $disabledSources +} + +$userName = "dn-bot" + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password + +# 3.1 uses a different feed url format so it's handled differently here +$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } + $dotnetVersions = @('5','6','7','8','9','10') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password - AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index b97cc536379d..ddf4efc81a4a 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -52,124 +52,78 @@ if [[ `uname -s` == "Darwin" ]]; then TB='' fi -# Enables an internal package source by name, if found. Returns 0 if found and enabled, 1 if not found. -EnableInternalPackageSource() { - local PackageSourceName="$1" - - # Check if disabledPackageSources section exists - grep -i "" "$ConfigFile" > /dev/null - if [ "$?" != "0" ]; then - return 1 # No disabled sources section - fi - - # Check if this source name is disabled - grep -i " /dev/null - if [ "$?" == "0" ]; then - echo "Enabling internal source '$PackageSourceName'." - # Remove the disabled entry (including any surrounding comments or whitespace on the same line) - sed -i.bak "//d" "$ConfigFile" - - # Add the source name to PackageSources for credential handling - PackageSources+=("$PackageSourceName") - return 0 # Found and enabled - fi - - return 1 # Not found in disabled sources -} - -# Add source entry to PackageSources -AddPackageSource() { - local SourceName="$1" - local SourceEndPoint="$2" - - # Check if source already exists - grep -i " /dev/null - if [ "$?" == "0" ]; then - echo "Package source $SourceName already present and enabled." - PackageSources+=("$SourceName") - return - fi - - echo "Adding package source $SourceName" - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" "$ConfigFile" - PackageSources+=("$SourceName") -} - -# Adds or enables the package source with the given name -AddOrEnablePackageSource() { - local SourceName="$1" - local SourceEndPoint="$2" - - # Try to enable if disabled, if not found then add new source - EnableInternalPackageSource "$SourceName" - if [ "$?" != "0" ]; then - AddPackageSource "$SourceName" "$SourceEndPoint" - fi -} - -# Enable all darc-int package sources -EnableMaestroInternalPackageSources() { - # Check if disabledPackageSources section exists - grep -i "" "$ConfigFile" > /dev/null - if [ "$?" != "0" ]; then - return # No disabled sources section - fi - - # Find all darc-int disabled sources - local DisabledDarcIntSources=() - DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' "$ConfigFile" | tr -d '"') - - for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do - if [[ $DisabledSourceName == darc-int* ]]; then - EnableInternalPackageSource "$DisabledSourceName" - fi - done -} - # Ensure there is a ... section. grep -i "" $ConfigFile if [ "$?" != "0" ]; then - Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" - ExitWithExitCode 1 + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile fi PackageSources=() -# Set feed suffix based on whether credentials are provided -FeedSuffix="v3/index.json" -if [ -n "$CredToken" ]; then - FeedSuffix="v2" - - # Ensure there is a ... section. - grep -i "" $ConfigFile +# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present +grep -i "... section." - + echo "Adding dotnet3.1-internal to the packageSources." PackageSourcesNodeFooter="" - PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + PackageSourceTemplate="${TB}" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile fi -fi + PackageSources+=('dotnet3.1-internal') -# Check for disabledPackageSources; we'll enable any darc-int ones we find there -grep -i "" $ConfigFile > /dev/null -if [ "$?" == "0" ]; then - echo "Checking for any darc-int disabled package sources in the disabledPackageSources node" - EnableMaestroInternalPackageSources + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3.1-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal-transport') fi DotNetVersions=('5' '6' '7' '8' '9' '10') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; - grep -i " /dev/null + grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=("$FeedPrefix-internal") + + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding $FeedPrefix-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=("$FeedPrefix-internal-transport") fi done @@ -185,12 +139,29 @@ if [ "$CredToken" ]; then # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile if [ "$?" != "0" ]; then - echo " Inserting credential for feed: $FeedName" + echo "Adding credentials for $FeedName." PackageSourceCredentialsNodeFooter="" - NewCredential="${TB}${TB}<$FeedName>${NL}${TB}${NL}${TB}${TB}${NL}${TB}${TB}" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi done fi + +# Re-enable any entries in disabledPackageSources where the feed name contains darc-int +grep -i "" $ConfigFile +if [ "$?" == "0" ]; then + DisabledDarcIntSources=() + echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile" + DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"') + for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do + if [[ $DisabledSourceName == darc-int* ]] + then + OldDisableValue="" + NewDisableValue="" + sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile + echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" + fi + done +fi diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..a365194a9389 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -30,7 +30,7 @@ [CmdletBinding(PositionalBinding = $false)] param( [string]$NuGetExePath, - [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", + [string]$PackageSource = "https://api.nuget.org/v3/index.json", [string]$DownloadPath, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$args diff --git a/global.json b/global.json index 9021a562cc03..b34719739a3a 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.111", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.111", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25506.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25506.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 4e02e81c3d645e388fd94cfc135d3ed8dd563a2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Oct 2025 16:31:04 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/dotnet build 20251006.3 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , 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.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.Components.WebAssembly , Microsoft.AspNetCore.Components.WebAssembly.Server , Microsoft.AspNetCore.Components.WebView , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Metadata , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , 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.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64 , Microsoft.NET.Sdk.WindowsDesktop , Microsoft.NETCore.App.Ref , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , Microsoft.WindowsDesktop.App.Internal , 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 From Version 10.0.0-rc.2.25502.107 -> To Version 10.0.0-rc.2.25506.103 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 10.0.0-preview.25502.107 -> To Version 10.0.0-preview.25506.103 Microsoft.Build , Microsoft.Build.Localization From Version 18.0.0-preview-25502-107 -> To Version 18.0.0-preview-25506-103 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 From Version 7.0.0-rc.307 -> To Version 7.0.0-preview.2.703 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 10.0.0-beta.25502.107 -> To Version 10.0.0-beta.25506.103 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 From Version 5.0.0-2.25502.107 -> To Version 5.0.0-2.25506.103 Microsoft.Deployment.DotNet.Releases From Version 2.0.0-preview.1.25502.107 -> To Version 2.0.0-preview.1.25506.103 Microsoft.DiaSymReader From Version 2.2.0-beta.25502.107 -> To Version 2.2.0-beta.25506.103 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 From Version 10.0.0-beta.25522.2 -> To Version 10.0.0-beta.25506.103 Microsoft.FSharp.Compiler From Version 14.0.100-rc2.25502.107 -> To Version 14.0.100-rc2.25506.103 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 18.0.0-preview-25502-107 -> To Version 18.1.0-preview-25506-103 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Authoring.TemplateVerifier , Microsoft.TemplateEngine.Edge , Microsoft.TemplateEngine.Mocks , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.TestHelper , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common , Microsoft.TemplateSearch.TemplateDiscovery From Version 10.0.100-rc.2.25502.107 -> To Version 10.0.100-rc.2.25506.103 Microsoft.Web.Xdt From Version 3.2.0-preview.25502.107 -> To Version 3.2.0-preview.25506.103 System.CommandLine From Version 2.0.0-rc.2.25502.107 -> To Version 2.0.0-rc.2.25506.103 --- eng/Version.Details.props | 288 ++++--- eng/Version.Details.xml | 780 +++++++++--------- .../steps/install-microbuild.yml | 15 +- global.json | 4 +- 4 files changed, 542 insertions(+), 545 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 22ead211796c..3b857105fea9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -5,149 +5,147 @@ This file should be imported by eng/Versions.props --> - - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-preview.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 18.0.0-preview-25502-107 - 18.0.0-preview-25502-107 - 7.0.0-rc.307 - 10.0.0-beta.25502.107 - 5.0.0-2.25502.107 - 5.0.0-2.25502.107 - 5.0.0-2.25502.107 - 5.0.0-2.25502.107 - 5.0.0-2.25502.107 - 5.0.0-2.25502.107 - 5.0.0-2.25502.107 - 10.0.0-preview.25502.107 - 5.0.0-2.25502.107 - 5.0.0-2.25502.107 - 2.0.0-preview.1.25502.107 - 2.2.0-beta.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 14.0.100-rc2.25502.107 - 10.0.0-rc.2.25502.107 - 5.0.0-2.25502.107 - 5.0.0-2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-preview.25502.107 - 10.0.0-rc.2.25502.107 - 18.0.0-preview-25502-107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-beta.25502.107 - 10.0.0-beta.25502.107 - 10.0.0-beta.25502.107 - 10.0.0-beta.25502.107 - 10.0.0-beta.25502.107 - 10.0.100-rc.2.25502.107 - 10.0.100-rc.2.25502.107 - 10.0.100-rc.2.25502.107 - 10.0.100-rc.2.25502.107 - 10.0.100-rc.2.25502.107 - 10.0.100-rc.2.25502.107 - 10.0.100-rc.2.25502.107 - 10.0.100-rc.2.25502.107 - 10.0.100-rc.2.25502.107 - 18.0.0-preview-25502-107 - 18.0.0-preview-25502-107 - 3.2.0-preview.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 7.0.0-rc.307 - 10.0.0-rc.2.25502.107 - 2.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - - 2.1.0 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-preview.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 18.0.0-preview-25506-103 + 18.0.0-preview-25506-103 + 7.0.0-preview.2.703 + 10.0.0-beta.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 10.0.0-preview.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 2.0.0-preview.1.25506.103 + 2.2.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 14.0.100-rc2.25506.103 + 10.0.0-rc.2.25506.103 + 5.0.0-2.25506.103 + 5.0.0-2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 10.0.0-preview.7.25377.103 - - 10.0.0-beta.25522.2 - 10.0.0-beta.25522.2 - 10.0.0-beta.25522.2 - 10.0.0-beta.25522.2 - 10.0.0-beta.25522.2 - 10.0.0-beta.25522.2 - 10.0.0-beta.25522.2 - 10.0.0-beta.25522.2 + 10.0.0-preview.25506.103 + 10.0.0-rc.2.25506.103 + 18.1.0-preview-25506-103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.0-beta.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 10.0.100-rc.2.25506.103 + 18.1.0-preview-25506-103 + 18.1.0-preview-25506-103 + 3.2.0-preview.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 7.0.0-preview.2.703 + 10.0.0-rc.2.25506.103 + 2.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + 10.0.0-rc.2.25506.103 + + 2.1.0 2.1.0-preview.25528.3 4.1.0-preview.25528.3 - + $(dotnetdevcertsPackageVersion) $(dotnetuserjwtsPackageVersion) $(dotnetusersecretsPackageVersion) @@ -189,8 +187,16 @@ This file should be imported by eng/Versions.props $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) @@ -207,6 +213,7 @@ This file should be imported by eng/Versions.props $(MicrosoftNETHostModelPackageVersion) $(MicrosoftNETILLinkTasksPackageVersion) $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETTestSdkPackageVersion) @@ -272,17 +279,6 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(NETStandardLibraryRefPackageVersion) - - $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) - - $(MicrosoftDotNetArcadeSdkPackageVersion) - $(MicrosoftDotNetBuildTasksInstallersPackageVersion) - $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) - $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) - $(MicrosoftDotNetHelixSdkPackageVersion) - $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetXliffTasksPackageVersion) - $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77769b4c636f..bc83711d1bcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,61 +2,61 @@ - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 https://github.com/microsoft/testfx @@ -561,9 +561,9 @@ https://github.com/microsoft/testfx 3263103d166e5868e36f185b049341a852ad64dc - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a + + https://github.com/dotnet/dotnet + 5558d2da527906dd610d5bfa63177e67e515b5e7 diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f2248ebfd730..d6b9878f54db 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -11,22 +11,23 @@ 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') }}: - # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms + # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin inputs: packageType: sdk version: 8.0.x - # 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 + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet + workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -64,7 +65,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -84,7 +85,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc env: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + 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/global.json b/global.json index aa17ec7efcf5..b34719739a3a 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25522.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25522.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25506.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25506.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"